From 257d8142b1af06e1a3892be5110b7b69e38a0659 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Thu, 14 Dec 2017 15:10:33 +0100
Subject: Build system: Get rid of QtVersionAbstraction.cmake

Use modern cmake with target_link_libraries and Qt5:: that
automatically add the include path and compile flags
---
 test/CMakeLists.txt          |  8 +-------
 test/owncloud_add_test.cmake | 10 ++++------
 2 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'test')

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b23678543..4617dfd2e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,4 @@
-include_directories(${QT_INCLUDES}
-                    ${CMAKE_SOURCE_DIR}/src
+include_directories(${CMAKE_SOURCE_DIR}/src
                     ${CMAKE_SOURCE_DIR}/src/3rdparty/qtokenizer
                     ${CMAKE_SOURCE_DIR}/src/csync
                     ${CMAKE_SOURCE_DIR}/src/csync/std
@@ -11,11 +10,6 @@ include_directories(${QT_INCLUDES}
                     ${CMAKE_CURRENT_BINARY_DIR}
                    )
 
-include_directories()
-
-include(QtVersionAbstraction)
-setup_qt()
-
 include(owncloud_add_test.cmake)
 
 owncloud_add_test(OwncloudPropagator "")
diff --git a/test/owncloud_add_test.cmake b/test/owncloud_add_test.cmake
index 7e7cc5057..ee2cfd200 100644
--- a/test/owncloud_add_test.cmake
+++ b/test/owncloud_add_test.cmake
@@ -1,17 +1,17 @@
+find_package(Qt5 COMPONENTS Core Test Xml Network REQUIRED)
+
 macro(owncloud_add_test test_class additional_cpp)
     set(CMAKE_AUTOMOC TRUE)
     set(OWNCLOUD_TEST_CLASS ${test_class})
     string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE)
 
     add_executable(${OWNCLOUD_TEST_CLASS}Test test${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp ${additional_cpp})
-    qt5_use_modules(${OWNCLOUD_TEST_CLASS}Test Test Sql Xml Network)
     set_target_properties(${OWNCLOUD_TEST_CLASS}Test PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY})
 
     target_link_libraries(${OWNCLOUD_TEST_CLASS}Test
         updater
         ${APPLICATION_EXECUTABLE}sync
-        ${QT_QTTEST_LIBRARY}
-        ${QT_QTCORE_LIBRARY}
+        Qt5::Core Qt5::Test Qt5::Xml Qt5::Network
     )
 
     add_definitions(-DOWNCLOUD_TEST)
@@ -25,14 +25,12 @@ macro(owncloud_add_benchmark test_class additional_cpp)
     string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE)
 
     add_executable(${OWNCLOUD_TEST_CLASS}Bench benchmarks/bench${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp ${additional_cpp})
-    qt5_use_modules(${OWNCLOUD_TEST_CLASS}Bench Test Sql Xml Network)
     set_target_properties(${OWNCLOUD_TEST_CLASS}Bench PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY})
 
     target_link_libraries(${OWNCLOUD_TEST_CLASS}Bench
         updater
         ${APPLICATION_EXECUTABLE}sync
-        ${QT_QTTEST_LIBRARY}
-        ${QT_QTCORE_LIBRARY}
+        Qt5::Core Qt5::Test Qt5::Xml Qt5::Network
     )
 
     add_definitions(-DOWNCLOUD_TEST)
-- 
cgit v1.2.3