diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-04-21 12:02:16 +0200 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@qt.io> | 2023-04-21 16:00:05 +0000 |
| commit | 24fe244ea6d8cac66db5f5354b8242cb53b1abb4 (patch) | |
| tree | 85e5f7c6948d681f890519acf1e05403259d38d5 | |
| parent | c95ade272b88af4835446f085440066bd5e34ccf (diff) | |
| download | qt-creator-24fe244ea6d8cac66db5f5354b8242cb53b1abb4.tar.gz | |
Build: Add SOURCES_PROPERTIES to extend_qtc_target
This way the check if the target is enabled and the condition is met
doesn't have to be done manually.
Change-Id: If490a84fd5f1ede2d032c3800f69ede4f755bc2c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
(cherry picked from commit 30bd12d8dc668631ab21831ac32588a5a304f533)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | cmake/QtCreatorAPIInternal.cmake | 6 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/CMakeLists.txt | 15 |
2 files changed, 11 insertions, 10 deletions
diff --git a/cmake/QtCreatorAPIInternal.cmake b/cmake/QtCreatorAPIInternal.cmake index efe7efd9ce..224ae4b2b1 100644 --- a/cmake/QtCreatorAPIInternal.cmake +++ b/cmake/QtCreatorAPIInternal.cmake @@ -464,7 +464,7 @@ function(extend_qtc_target target_name) cmake_parse_arguments(_arg "" "SOURCES_PREFIX;SOURCES_PREFIX_FROM_TARGET;FEATURE_INFO" - "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES" + "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES;SOURCES_PROPERTIES" ${ARGN} ) @@ -546,4 +546,8 @@ function(extend_qtc_target target_name) if (_arg_PROPERTIES) set_target_properties(${target_name} PROPERTIES ${_arg_PROPERTIES}) endif() + + if (_arg_SOURCES_PROPERTIES) + set_source_files_properties(${_arg_SOURCES} PROPERTIES ${_arg_SOURCES_PROPERTIES}) + endif() endfunction() diff --git a/src/plugins/projectexplorer/CMakeLists.txt b/src/plugins/projectexplorer/CMakeLists.txt index 58f8c73d1d..d05509636e 100644 --- a/src/plugins/projectexplorer/CMakeLists.txt +++ b/src/plugins/projectexplorer/CMakeLists.txt @@ -216,9 +216,14 @@ extend_qtc_plugin(ProjectExplorer extend_qtc_plugin(ProjectExplorer CONDITION WITH_TESTS SOURCES - jsonwizard/jsonwizard_test.cpp outputparser_test.cpp outputparser_test.h ) +extend_qtc_plugin(ProjectExplorer + CONDITION WITH_TESTS + SOURCES + jsonwizard/jsonwizard_test.cpp + SOURCES_PROPERTIES HEADER_FILE_ONLY ON +) file(GLOB_RECURSE test_resources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} testdata/*) qtc_add_resources(ProjectExplorer "testdata" @@ -227,11 +232,3 @@ qtc_add_resources(ProjectExplorer "testdata" BASE "." FILES ${test_resources} ) - -qtc_plugin_enabled(_projectexplorer_enabled ProjectExplorer) -if (WITH_TESTS AND _projectexplorer_enabled) - set_source_files_properties(jsonwizard/jsonwizard_test.cpp - PROPERTIES HEADER_FILE_ONLY ON - ) -endif() - |