diff options
| author | Linus Jahn <lnj@kaidan.im> | 2021-02-26 20:20:30 +0100 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2021-02-26 21:03:37 +0100 |
| commit | 9a1134a415cd550dcb6efd35bd1cf98b8faa236e (patch) | |
| tree | 92725cc756781f9cfa327fb59d41970d44f629c8 /tests | |
| parent | fbd0f2431d1fe753169244f912c6055236180d25 (diff) | |
| download | qxmpp-9a1134a415cd550dcb6efd35bd1cf98b8faa236e.tar.gz | |
cmake: Simplify Qt5/Qt6 handling
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/qxmpptransfermanager/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/qxmppuploadrequestmanager/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/qxmpputils/CMakeLists.txt | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cb65d2bc..313d16bc 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,14 +1,11 @@ include_directories(.) -find_package(Qt6 QUIET COMPONENTS Test) -if(NOT Qt6_FOUND) - find_package(Qt5 REQUIRED COMPONENTS Test) -endif() +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Test) macro(add_simple_test TEST_NAME) add_executable(tst_${TEST_NAME} ${TEST_NAME}/tst_${TEST_NAME}.cpp) add_test(tst_${TEST_NAME} tst_${TEST_NAME}) - target_link_libraries(tst_${TEST_NAME} ${QT_TARGET}::Test qxmpp) + target_link_libraries(tst_${TEST_NAME} Qt${QT_VERSION_MAJOR}::Test qxmpp) endmacro() include_directories(${PROJECT_SOURCE_DIR}/src/base) diff --git a/tests/qxmpptransfermanager/CMakeLists.txt b/tests/qxmpptransfermanager/CMakeLists.txt index 9648e694..232dbcbd 100644 --- a/tests/qxmpptransfermanager/CMakeLists.txt +++ b/tests/qxmpptransfermanager/CMakeLists.txt @@ -1,4 +1,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_executable(tst_qxmpptransfermanager tst_qxmpptransfermanager.cpp tst_qxmpptransfermanager.qrc) add_test(tst_qxmpptransfermanager tst_qxmpptransfermanager) -target_link_libraries(tst_qxmpptransfermanager ${QT_TARGET}::Test qxmpp) +target_link_libraries(tst_qxmpptransfermanager Qt${QT_VERSION_MAJOR}::Test qxmpp) diff --git a/tests/qxmppuploadrequestmanager/CMakeLists.txt b/tests/qxmppuploadrequestmanager/CMakeLists.txt index 9e74f754..62cdf06d 100644 --- a/tests/qxmppuploadrequestmanager/CMakeLists.txt +++ b/tests/qxmppuploadrequestmanager/CMakeLists.txt @@ -1,4 +1,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_executable(tst_qxmppuploadrequestmanager tst_qxmppuploadrequestmanager.cpp tst_qxmppuploadrequestmanager.qrc) add_test(tst_qxmppuploadrequestmanager tst_qxmppuploadrequestmanager) -target_link_libraries(tst_qxmppuploadrequestmanager ${QT_TARGET}::Test qxmpp) +target_link_libraries(tst_qxmppuploadrequestmanager Qt${QT_VERSION_MAJOR}::Test qxmpp) diff --git a/tests/qxmpputils/CMakeLists.txt b/tests/qxmpputils/CMakeLists.txt index 24cf90f0..83032d6b 100644 --- a/tests/qxmpputils/CMakeLists.txt +++ b/tests/qxmpputils/CMakeLists.txt @@ -1,4 +1,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_executable(tst_qxmpputils tst_qxmpputils.cpp tst_qxmpputils.qrc) add_test(tst_qxmpputils tst_qxmpputils) -target_link_libraries(tst_qxmpputils ${QT_TARGET}::Test qxmpp) +target_link_libraries(tst_qxmpputils Qt${QT_VERSION_MAJOR}::Test qxmpp) |