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

Build: Add SOURCES_PROPERTIES to extend_qtc_target

Browse Source 
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 30bd12d8dc)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Eike Ziller
2023-04-21 12:02:16 +02:00
committed by Marco Bubke
parent c95ade272b
commit 24fe244ea6
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QtCreatorAPIInternal.cmake
View File

@@ -464,7 +464,7 @@ function(extend_qtc_target target_name)
cmake_parse_arguments(_arg cmake_parse_arguments(_arg
"" ""
"SOURCES_PREFIX;SOURCES_PREFIX_FROM_TARGET;FEATURE_INFO" "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} ${ARGN}
) )
@@ -546,4 +546,8 @@ function(extend_qtc_target target_name)
if (_arg_PROPERTIES) if (_arg_PROPERTIES)
set_target_properties(${target_name} PROPERTIES ${_arg_PROPERTIES}) set_target_properties(${target_name} PROPERTIES ${_arg_PROPERTIES})
endif() endif()
if (_arg_SOURCES_PROPERTIES)
set_source_files_properties(${_arg_SOURCES} PROPERTIES ${_arg_SOURCES_PROPERTIES})
endif()
endfunction() endfunction()

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

@@ -216,9 +216,14 @@ extend_qtc_plugin(ProjectExplorer
extend_qtc_plugin(ProjectExplorer extend_qtc_plugin(ProjectExplorer
CONDITION WITH_TESTS CONDITION WITH_TESTS
SOURCES SOURCES
jsonwizard/jsonwizard_test.cpp
outputparser_test.cpp outputparser_test.h 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/*) file(GLOB_RECURSE test_resources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} testdata/*)
qtc_add_resources(ProjectExplorer "testdata" qtc_add_resources(ProjectExplorer "testdata"
@@ -227,11 +232,3 @@ qtc_add_resources(ProjectExplorer "testdata"
BASE "." BASE "."
FILES ${test_resources} 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()