diff options
| author | Linus Jahn <lnj@kaidan.im> | 2020-07-02 18:58:43 +0200 |
|---|---|---|
| committer | LNJ <lnj@kaidan.im> | 2020-07-03 13:13:31 +0200 |
| commit | 8d6f865a9e312d3b4f686ff99af6e7fe9e8c5b13 (patch) | |
| tree | 01d2942a5d91400c5233d67aa347585b5d6b2731 /tests | |
| parent | 3dd3cb24f419b1a1cac2b7a0121507fd86000986 (diff) | |
| download | qxmpp-8d6f865a9e312d3b4f686ff99af6e7fe9e8c5b13.tar.gz | |
Introduce Qt 6 compatibility
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 8 | ||||
| -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, 8 insertions, 6 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 04c160fa..95134421 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,11 +1,14 @@ include_directories(.) -find_package(Qt5 REQUIRED COMPONENTS Test) +find_package(Qt6 COMPONENTS Test) +if(NOT Qt6_FOUND) + find_package(Qt5 REQUIRED COMPONENTS Test) +endif() 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} Qt5::Test qxmpp) + target_link_libraries(tst_${TEST_NAME} ${QT_TARGET}::Test qxmpp) endmacro() include_directories(${PROJECT_SOURCE_DIR}/src/base) @@ -66,4 +69,3 @@ endif() add_subdirectory(qxmpptransfermanager) add_subdirectory(qxmpputils) add_subdirectory(qxmppuploadrequestmanager) - diff --git a/tests/qxmpptransfermanager/CMakeLists.txt b/tests/qxmpptransfermanager/CMakeLists.txt index 31bc5633..9648e694 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 Qt5::Test qxmpp) +target_link_libraries(tst_qxmpptransfermanager ${QT_TARGET}::Test qxmpp) diff --git a/tests/qxmppuploadrequestmanager/CMakeLists.txt b/tests/qxmppuploadrequestmanager/CMakeLists.txt index 197cca0a..9e74f754 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 Qt5::Test qxmpp) +target_link_libraries(tst_qxmppuploadrequestmanager ${QT_TARGET}::Test qxmpp) diff --git a/tests/qxmpputils/CMakeLists.txt b/tests/qxmpputils/CMakeLists.txt index db208306..24cf90f0 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 Qt5::Test qxmpp) +target_link_libraries(tst_qxmpputils ${QT_TARGET}::Test qxmpp) |