From 032fdcbcc00380e9a181f5adf2be767194bb35d3 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 2 Jul 2024 18:06:29 +0200 Subject: [PATCH] Use add_compile_definitions instead of add_definitions add_compile_definitions allows having the generator expressions as the items in the definition list. add_definitions do not support pure $<...> without the prescending macro name with the assignment. Pick-to: 6.5 6.7 6.8 Change-Id: I1e79f1cf395b62b1e481eb0f3c74f93c61f06381 Reviewed-by: Alexandru Croitor --- tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt | 2 +- tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt | 2 +- tests/auto/testlib/selftests/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt b/tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt index 2515f61d05f..f4b182b595a 100644 --- a/tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt +++ b/tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt @@ -20,7 +20,7 @@ include_directories( ${Qt6Test_INCLUDE_DIRS} ) -add_definitions( +add_compile_definitions( ${Qt6Gui_DEFINITIONS} ${Qt6Test_DEFINITIONS} ) diff --git a/tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt b/tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt index 89965032b27..bde7e8b4159 100644 --- a/tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt +++ b/tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt @@ -20,7 +20,7 @@ include_directories( ${Qt6Test_INCLUDE_DIRS} ) -add_definitions( +add_compile_definitions( ${Qt6Widgets_DEFINITIONS} ${Qt6Test_DEFINITIONS} ) diff --git a/tests/auto/testlib/selftests/CMakeLists.txt b/tests/auto/testlib/selftests/CMakeLists.txt index 9e17638a660..366a4404d6e 100644 --- a/tests/auto/testlib/selftests/CMakeLists.txt +++ b/tests/auto/testlib/selftests/CMakeLists.txt @@ -120,7 +120,7 @@ if(TARGET Qt::Gui) endif() # Ensure uniform location info between release and debug builds -add_definitions(-DQT_MESSAGELOGCONTEXT) +add_compile_definitions(QT_MESSAGELOGCONTEXT) foreach(subprogram IN LISTS subprograms) add_subdirectory(${subprogram})