diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-05 19:51:50 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-05 19:51:50 +0200 |
commit | 025e88bfe5b2345dd09c173dc28a9d9a45ed11de (patch) | |
tree | 0180b9123e479d7114b1caf2022dd8ff69162a17 /tests/auto/cmake | |
parent | ae7e701074be97130aa45f780e2456981850b432 (diff) | |
parent | 538223d10d133d23133db1ec7a50cb2775aca657 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I003c0d6271c6444748bf30b4331eca3fb2410f44
Diffstat (limited to 'tests/auto/cmake')
-rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/cmake/test_versionless_targets/CMakeLists.txt | 23 |
2 files changed, 24 insertions, 0 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 7717b0136e..ac9c1d5197 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -161,3 +161,4 @@ if (NOT CMAKE_VERSION VERSION_LESS 3.8) endif() expect_pass(test_import_plugins BINARY ${CMAKE_CTEST_COMMAND}) +expect_pass(test_versionless_targets) diff --git a/tests/auto/cmake/test_versionless_targets/CMakeLists.txt b/tests/auto/cmake/test_versionless_targets/CMakeLists.txt new file mode 100644 index 0000000000..d2edafbd3e --- /dev/null +++ b/tests/auto/cmake/test_versionless_targets/CMakeLists.txt @@ -0,0 +1,23 @@ +cmake_minimum_required(VERSION 3.1) + +project(versionless_targets) + +set(QT_NO_CREATE_VERSIONLESS_TARGETS ON) + +find_package(Qt5Core REQUIRED) + +if (NOT TARGET Qt5::Core) + message(SEND_ERROR "Qt5::Core target not defined!") +endif() + +if (TARGET Qt::Core) + message(SEND_ERROR "Qt::Core target defined despite QT_NO_CREATE_VERSIONLESS_TARGETS!") +endif() + +set(QT_NO_CREATE_VERSIONLESS_TARGETS OFF) + +find_package(Qt5Core REQUIRED) + +if (NOT TARGET Qt::Core) + message(SEND_ERROR "Qt::Core target not defined!") +endif() |