From 7ee45fb74e3ba66e382a10ad28efc371a583279f Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 25 Sep 2020 16:25:34 +0200 Subject: CMake: Regenerate projects to use new qt_internal_ API Modify special case locations to use the new API as well. Task-number: QTBUG-86815 Change-Id: I6150fa53afd477a9770c71ac06525b3ad927ece9 Reviewed-by: Cristian Adam --- tests/postbuild/bic/.prev_CMakeLists.txt | 2 +- tests/postbuild/bic/CMakeLists.txt | 2 +- tests/postbuild/guiapplauncher/.prev_CMakeLists.txt | 6 +++--- tests/postbuild/guiapplauncher/CMakeLists.txt | 6 +++--- tests/postbuild/headers/CMakeLists.txt | 2 +- tests/postbuild/symbols/CMakeLists.txt | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'tests') diff --git a/tests/postbuild/bic/.prev_CMakeLists.txt b/tests/postbuild/bic/.prev_CMakeLists.txt index fb935d3..8906191 100644 --- a/tests/postbuild/bic/.prev_CMakeLists.txt +++ b/tests/postbuild/bic/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bic Test: ##################################################################### -qt_add_test(tst_bic +qt_internal_add_test(tst_bic SOURCES ../global.h qbic.cpp qbic.h diff --git a/tests/postbuild/bic/CMakeLists.txt b/tests/postbuild/bic/CMakeLists.txt index 3044034..a450223 100644 --- a/tests/postbuild/bic/CMakeLists.txt +++ b/tests/postbuild/bic/CMakeLists.txt @@ -26,7 +26,7 @@ endif() # special case end -qt_add_test(tst_bic +qt_internal_add_test(tst_bic SOURCES ../global.h qbic.cpp qbic.h diff --git a/tests/postbuild/guiapplauncher/.prev_CMakeLists.txt b/tests/postbuild/guiapplauncher/.prev_CMakeLists.txt index be97193..b13a4f9 100644 --- a/tests/postbuild/guiapplauncher/.prev_CMakeLists.txt +++ b/tests/postbuild/guiapplauncher/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_guiapplauncher Test: ##################################################################### -qt_add_test(tst_guiapplauncher +qt_internal_add_test(tst_guiapplauncher SOURCES tst_guiapplauncher.cpp windowmanager.cpp windowmanager.h @@ -20,12 +20,12 @@ qt_add_test(tst_guiapplauncher ## Scopes: ##################################################################### -qt_extend_target(tst_guiapplauncher CONDITION WIN32 +qt_internal_extend_target(tst_guiapplauncher CONDITION WIN32 PUBLIC_LIBRARIES user32 ) -qt_extend_target(tst_guiapplauncher CONDITION QT_CONFIG___contains___xlib +qt_internal_extend_target(tst_guiapplauncher CONDITION QT_CONFIG___contains___xlib DEFINES Q_WS_X11 ) diff --git a/tests/postbuild/guiapplauncher/CMakeLists.txt b/tests/postbuild/guiapplauncher/CMakeLists.txt index 2c86646..86e463b 100644 --- a/tests/postbuild/guiapplauncher/CMakeLists.txt +++ b/tests/postbuild/guiapplauncher/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_guiapplauncher Test: ##################################################################### -qt_add_test(tst_guiapplauncher +qt_internal_add_test(tst_guiapplauncher SOURCES tst_guiapplauncher.cpp windowmanager.cpp windowmanager.h @@ -20,12 +20,12 @@ qt_add_test(tst_guiapplauncher ## Scopes: ##################################################################### -qt_extend_target(tst_guiapplauncher CONDITION WIN32 +qt_internal_extend_target(tst_guiapplauncher CONDITION WIN32 PUBLIC_LIBRARIES user32 ) -qt_extend_target(tst_guiapplauncher CONDITION QT_FEATURE_xlib # special case +qt_internal_extend_target(tst_guiapplauncher CONDITION QT_FEATURE_xlib # special case DEFINES Q_WS_X11 ) diff --git a/tests/postbuild/headers/CMakeLists.txt b/tests/postbuild/headers/CMakeLists.txt index ed75e2a..6f6d857 100644 --- a/tests/postbuild/headers/CMakeLists.txt +++ b/tests/postbuild/headers/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_headers Test: ##################################################################### -qt_add_test(tst_headers +qt_internal_add_test(tst_headers SOURCES tst_headers.cpp ) diff --git a/tests/postbuild/symbols/CMakeLists.txt b/tests/postbuild/symbols/CMakeLists.txt index cce68c2..133fbfb 100644 --- a/tests/postbuild/symbols/CMakeLists.txt +++ b/tests/postbuild/symbols/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_symbols Test: ##################################################################### -qt_add_test(tst_symbols +qt_internal_add_test(tst_symbols SOURCES tst_symbols.cpp INCLUDE_DIRECTORIES @@ -14,7 +14,7 @@ qt_add_test(tst_symbols ## Scopes: ##################################################################### -qt_extend_target(tst_symbols CONDITION CMAKE_CROSSCOMPILING +qt_internal_extend_target(tst_symbols CONDITION CMAKE_CROSSCOMPILING DEFINES QT_CROSS_COMPILED ) -- cgit v1.2.1