summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-10-27 22:43:25 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-10-29 12:40:34 +0200
commitc9b773d7514268d360af78ef1f56d2669149951d (patch)
tree52b8d8c65e88f919f9a0c30ca6547a63ae1ec7d7 /tests/auto
parentb2f6bcec5125b099345a521735bc1e820ce8f310 (diff)
CMake: Replace deprecated QT_TOOL_PATH_SETUP_COMMAND
...with _qt_internal_wrap_tool_command() calls. An explicit dependency to the qscxmlc target needs to be added. See CMP0112. Change-Id: Ibad7000de505517bcb40c83ab218318e2b4e82db Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/scion/CMakeLists.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/scion/CMakeLists.txt b/tests/auto/scion/CMakeLists.txt
index 940fc67..9f7020a 100644
--- a/tests/auto/scion/CMakeLists.txt
+++ b/tests/auto/scion/CMakeLists.txt
@@ -1,4 +1,3 @@
-
#####################################################################
## tst_scion Test:
#####################################################################
@@ -80,6 +79,9 @@ set(scxmls_dir ../../3rdparty/scion-tests/scxml-test-framework/test)
get_filename_component(scxmls_dir ${scxmls_dir} ABSOLUTE)
file(GLOB_RECURSE allscxmls ${scxmls_dir}/*.scxml)
+_qt_internal_wrap_tool_command(qscxmlc_command SET
+ "$<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::qscxmlc>")
+
set(scxmls)
set(inc_list)
set(func_list)
@@ -109,9 +111,9 @@ foreach(f ${allscxmls})
file(TO_NATIVE_PATH ${out_cpp} native_out_cpp)
add_custom_command(
OUTPUT ${out_cpp} ${out_h}
- ${QT_TOOL_PATH_SETUP_COMMAND}
- COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qscxmlc
- ARGS --header ${native_out_h} --impl ${native_out_cpp} --namespace ${sn} --classname ${cn} ${f}
+ ${qscxmlc_command} --header ${native_out_h} --impl ${native_out_cpp}
+ --namespace ${sn} --classname ${cn} ${f}
+ DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::qscxmlc
VERBATIM
)
set_source_files_properties(${out_h} ${out_cpp} PROPERTIES SKIP_AUTOMOC TRUE)