feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Enhance qtc_add_resources with CONDITION

Browse Source 
like most other functions

Amends 201786d3fc

Change-Id: Id35b9730dd6c9b55e80b99068a8ec98d30538705
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2021-05-06 16:04:54 +02:00
parent 7cb7e221bd
commit b66a403f36
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/QtCreatorAPI.cmake
View File

@@ -902,7 +902,14 @@ function(qtc_copy_to_builddir custom_target_name)
endfunction() endfunction()
function(qtc_add_resources target resourceName) function(qtc_add_resources target resourceName)
cmake_parse_arguments(rcc "" "PREFIX;LANG;BASE" "FILES;OPTIONS" ${ARGN}) cmake_parse_arguments(rcc "" "PREFIX;LANG;BASE" "FILES;OPTIONS;CONDITION" ${ARGN})
if (${_arg_UNPARSED_ARGUMENTS})
message(FATAL_ERROR "qtc_add_resources had unparsed arguments!")
endif()
if (DEFINED _arg_CONDITION AND NOT _arg_CONDITION)
return()
endif()
string(REPLACE "/" "_" resourceName ${resourceName}) string(REPLACE "/" "_" resourceName ${resourceName})
string(REPLACE "." "_" resourceName ${resourceName}) string(REPLACE "." "_" resourceName ${resourceName})

7
src/plugins/projectexplorer/CMakeLists.txt
View File

@@ -215,9 +215,10 @@ extend_qtc_plugin(ProjectExplorer
jsonwizard/jsonwizard_test.cpp jsonwizard/jsonwizard_test.cpp
outputparser_test.cpp outputparser_test.h outputparser_test.cpp outputparser_test.h
) )
if (WITH_TESTS)
file(GLOB_RECURSE test_resources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} testdata/*) file(GLOB_RECURSE test_resources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} testdata/*)
qtc_add_resources(ProjectExplorer "testdata" qtc_add_resources(ProjectExplorer "testdata"
CONDITION WITH_TESTS
PREFIX "/projectexplorer" PREFIX "/projectexplorer"
BASE "." BASE "."
FILES ${test_resources} FILES ${test_resources}