From 30bd12d8dc668631ab21831ac32588a5a304f533 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Fri, 21 Apr 2023 12:02:16 +0200
Subject: [PATCH] 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>
---
 cmake/QtCreatorAPIInternal.cmake           |  6 +++++-
 src/plugins/projectexplorer/CMakeLists.txt | 15 ++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cmake/QtCreatorAPIInternal.cmake b/cmake/QtCreatorAPIInternal.cmake
index 479a6fb179b..bbb4db462e7 100644
--- a/cmake/QtCreatorAPIInternal.cmake
+++ b/cmake/QtCreatorAPIInternal.cmake
@@ -465,7 +465,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}
   )
 
@@ -547,4 +547,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 e2bf33309ef..1ed25adadac 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()
-