From 6d1c695b0e32b644d13a088ab3363b6aef75de68 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 4 Jun 2019 11:47:30 +0200 Subject: cmake: Fix testlib/selftests Actually build tst_selftest Fix the subdirs of it not to be actually built as tests (so that ctest doesn't pick them up and tries to run them) Change-Id: Id9d069f44241027dbd103884d36551163382b216 Reviewed-by: Alexandru Croitor Reviewed-by: Qt CMake Build Bot --- .../selftests/verifyexceptionthrown/CMakeLists.txt | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt (limited to 'tests/auto/testlib/selftests/verifyexceptionthrown') diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt b/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt new file mode 100644 index 0000000000..817eddaee8 --- /dev/null +++ b/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from verifyexceptionthrown.pro. + +##################################################################### +## verifyexceptionthrown Binary: +##################################################################### + +add_qt_executable(verifyexceptionthrown + NO_INSTALL # special case + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case + GUI + SOURCES + tst_verifyexceptionthrown.cpp + PUBLIC_LIBRARIES + Qt::Test +) + +#### Keys ignored in scope 1:.:.:verifyexceptionthrown.pro:: +# CONFIG = "-debug_and_release_target" "exceptions" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:verifyexceptionthrown.pro:APPLE_OSX: +# CONFIG = "-app_bundle" -- cgit v1.2.3 From 63f2b8c7a885a84fc8f240ec8e4ac88c3a3c6e64 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 4 Jun 2019 15:48:53 +0200 Subject: Include the .prev_CMakeLists.txt files for selftests This will help with future regeneration. Amends 6d1c695b0e32b644d13a088ab3363b6aef75de68 Change-Id: I2454dc36cfc00f7aad72488fb7927d7807978fd8 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- .../verifyexceptionthrown/.prev_CMakeLists.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt (limited to 'tests/auto/testlib/selftests/verifyexceptionthrown') diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt new file mode 100644 index 0000000000..fb28197adc --- /dev/null +++ b/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt @@ -0,0 +1,22 @@ +# Generated from verifyexceptionthrown.pro. + +##################################################################### +## verifyexceptionthrown Binary: +##################################################################### + +add_qt_executable(verifyexceptionthrown + GUI + SOURCES + tst_verifyexceptionthrown.cpp + PUBLIC_LIBRARIES + Qt::Test +) + +#### Keys ignored in scope 1:.:.:verifyexceptionthrown.pro:: +# CONFIG = "-debug_and_release_target" "exceptions" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:verifyexceptionthrown.pro:APPLE_OSX: +# CONFIG = "-app_bundle" -- cgit v1.2.3 From bfa209dfa557e7c30d654add09f5c8f97cfc2492 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 4 Jun 2019 15:55:41 +0200 Subject: cmake: build with exceptions disabled by default Only re-enable exceptions for the modules that do CONFIG+=exceptions in qmake Change-Id: I9f19078adbdc1b8fa3d4102fb51a099e7e35522e Reviewed-by: Simon Hausmann --- tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/auto/testlib/selftests/verifyexceptionthrown') diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt b/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt index 817eddaee8..24dd224107 100644 --- a/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt +++ b/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### add_qt_executable(verifyexceptionthrown + EXCEPTIONS NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case GUI -- cgit v1.2.3 From 71c43b035b24269a36d09ef77b1f3f139406fbfc Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 13 Nov 2019 11:02:59 +0100 Subject: Regenerate tests/auto/testlib Change-Id: If1b2e105836b73b1a68ed5a8e11feb8e114d66e2 Reviewed-by: Leander Beernaert Reviewed-by: Simon Hausmann --- .../testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt | 8 +------- tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt | 7 ------- 2 files changed, 1 insertion(+), 14 deletions(-) (limited to 'tests/auto/testlib/selftests/verifyexceptionthrown') diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt index fb28197adc..f4e20fcfc6 100644 --- a/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt @@ -5,18 +5,12 @@ ##################################################################### add_qt_executable(verifyexceptionthrown - GUI + EXCEPTIONS SOURCES tst_verifyexceptionthrown.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:verifyexceptionthrown.pro:: -# CONFIG = "-debug_and_release_target" "exceptions" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:verifyexceptionthrown.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt b/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt index 24dd224107..def296ed7b 100644 --- a/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt +++ b/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt @@ -8,18 +8,11 @@ add_qt_executable(verifyexceptionthrown EXCEPTIONS NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_verifyexceptionthrown.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:verifyexceptionthrown.pro:: -# CONFIG = "-debug_and_release_target" "exceptions" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:verifyexceptionthrown.pro:APPLE_OSX: -# CONFIG = "-app_bundle" -- cgit v1.2.3