diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2017-12-14 17:10:33 +0300 |
---|---|---|
committer | Dominik Schmidt <dev@dominik-schmidt.de> | 2018-01-13 15:58:17 +0300 |
commit | 257d8142b1af06e1a3892be5110b7b69e38a0659 (patch) | |
tree | 62845dbfc9850dda732659b60e3d08d39c154ba5 | |
parent | 48c55b7d29e3910510364f1e621144565a739621 (diff) |
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
-rw-r--r-- | CMakeLists.txt | 35 | ||||
-rw-r--r-- | cmake/modules/QtVersionAbstraction.cmake | 104 | ||||
-rw-r--r-- | cmake/modules/Warnings.cmake | 1 | ||||
-rw-r--r-- | src/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/cmd/CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/crashreporter/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/csync/CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/gui/CMakeLists.txt | 50 | ||||
-rw-r--r-- | src/gui/application.cpp | 8 | ||||
-rw-r--r-- | src/libsync/CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/libsync/discoveryphase.cpp | 1 | ||||
-rw-r--r-- | test/CMakeLists.txt | 8 | ||||
-rw-r--r-- | test/owncloud_add_test.cmake | 10 |
13 files changed, 64 insertions, 180 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9975452f9..132d93b1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,4 @@ - -cmake_minimum_required(VERSION 2.6) -cmake_policy(VERSION 2.8.0) -if(POLICY CMP0020) - cmake_policy(SET CMP0020 NEW) -endif() +cmake_minimum_required(VERSION 3.0) project(client) @@ -61,14 +56,6 @@ if(NOT WITH_CRASHREPORTER) message(STATUS "Build of crashreporter disabled.") endif() -##### -## handle DBUS for Fdo notifications -if( UNIX AND NOT APPLE ) - add_definitions( -DUSE_FDO_NOTIFICATIONS) - set(WITH_DBUS ON) -endif() -#### - include(GNUInstallDirs) include(DefineInstallationPaths) include(GenerateExportHeader) @@ -77,6 +64,12 @@ include(GetGitRevisionDescription) get_git_head_revision(GIT_REFSPEC GIT_SHA1) +add_definitions( + -DQT_USE_QSTRINGBUILDER + -DQT_MESSAGELOGCONTEXT #enable function name and line number in debug output + -DQT_DEPRECATED_WARNINGS +) + # if we cannot get it from git, directly try .tag (packages) # this will work if the tar balls have been properly created # via git-archive. @@ -218,20 +211,6 @@ add_definitions( -D_WIN32_WINNT=0x0600) add_definitions( -DWINVER=0x0600) endif( WIN32 ) -include(QtVersionAbstraction) -setup_qt() -if (${Qt5Core_VERSION_MAJOR} EQUAL "5") - if (${Qt5Core_VERSION_MINOR} EQUAL "6" OR ${Qt5Core_VERSION_MINOR} GREATER 6) - else() - message(FATAL_ERROR "Qt 5.6 or higher is required.") - endif() - if (${Qt5Core_VERSION_MINOR} EQUAL "9" OR ${Qt5Core_VERSION_MINOR} GREATER 9) - else() - message(STATUS "For HTTP2 use Qt 5.9.2 or higher.") - endif() -endif() -message("Qt ${Qt5Core_VERSION} at ${Qt5Core_INCLUDE_DIRS}") - if (APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") endif() diff --git a/cmake/modules/QtVersionAbstraction.cmake b/cmake/modules/QtVersionAbstraction.cmake deleted file mode 100644 index ce48b4487..000000000 --- a/cmake/modules/QtVersionAbstraction.cmake +++ /dev/null @@ -1,104 +0,0 @@ -# (c) 2014 Copyright ownCloud GmbH -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING* file. - -include (MacroOptionalFindPackage) -include (MacroLogFeature) - -find_package(Qt5Core REQUIRED) -find_package(Qt5Network REQUIRED) -find_package(Qt5Xml REQUIRED) -find_package(Qt5Concurrent REQUIRED) -if(UNIT_TESTING) - find_package(Qt5Test REQUIRED) -endif() - -if(NOT TOKEN_AUTH_ONLY) - find_package(Qt5Widgets REQUIRED) - if(APPLE) - find_package(Qt5MacExtras REQUIRED) - endif(APPLE) - - if(NOT NO_SHIBBOLETH) - find_package(Qt5WebKitWidgets) - find_package(Qt5WebKit) - if(NOT Qt5WebKitWidgets_FOUND) - message(FATAL_ERROR "Qt5WebKit required for Shibboleth. Use -DNO_SHIBBOLETH=1 to disable it.") - endif() - endif() -endif() - -# We need this to find the paths to qdbusxml2cpp and co -if (WITH_DBUS) - find_package(Qt5DBus REQUIRED) - include_directories(${Qt5DBus_INCLUDES}) - add_definitions(${Qt5DBus_DEFINITIONS}) -endif (WITH_DBUS) -include_directories(${Qt5Core_INCLUDES}) -add_definitions(${Qt5Core_DEFINITIONS}) -if (NOT WIN32) #implied on Win32 - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") -endif(NOT WIN32) -# set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") - -if(APPLE AND NOT TOKEN_AUTH_ONLY) - include_directories(${Qt5MacExtras_INCLUDE_DIRS}) - add_definitions(${Qt5MacExtras_DEFINITIONS}) - set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES}) -endif() - -if(NOT BUILD_LIBRARIES_ONLY) - macro(qt_wrap_ui) - qt5_wrap_ui(${ARGN}) - endmacro() -else() - # hack - SET(QT_UIC_EXECUTABLE "") -endif() - -macro(qt_add_resources) - qt5_add_resources(${ARGN}) -endmacro() - -if(NOT TOKEN_AUTH_ONLY) - find_package(Qt5LinguistTools) - if(Qt5LinguistTools_FOUND) - macro(qt_add_translation) - qt5_add_translation(${ARGN}) - endmacro() - else() - macro(qt_add_translation) - endmacro() - endif() -else() - macro(qt_add_translation) - endmacro() -endif() - -macro(qt_add_dbus_interface) - qt5_add_dbus_interface(${ARGN}) -endmacro() - -macro(qt_add_dbus_adaptor) - qt5_add_dbus_adaptor(${ARGN}) -endmacro() - -macro(qt_wrap_cpp) - qt5_wrap_cpp(${ARGN}) -endmacro() - -macro(install_qt_executable) - install_qt5_executable(${ARGN}) -endmacro() - -macro(setup_qt) -endmacro() - -set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}") - -#Enable deprecated symbols -add_definitions("-DQT_DISABLE_DEPRECATED_BEFORE=0") -add_definitions("-DQT_DEPRECATED_WARNINGS") -add_definitions("-DQT_USE_QSTRINGBUILDER") #optimize string concatenation -add_definitions("-DQT_MESSAGELOGCONTEXT") #enable function name and line number in debug output - diff --git a/cmake/modules/Warnings.cmake b/cmake/modules/Warnings.cmake index 0edabd2a9..8faff001f 100644 --- a/cmake/modules/Warnings.cmake +++ b/cmake/modules/Warnings.cmake @@ -4,7 +4,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long -Wno-gnu-zero-variadic-macro-arguments") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 894f93e4c..e20358c18 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,6 +4,11 @@ endif() set(synclib_NAME ${APPLICATION_EXECUTABLE}sync) +find_package(Qt5 5.6 COMPONENTS Core Network Xml Concurrent REQUIRED) +if (Qt5Core_VERSION VERSION_LESS 5.9.0) +message(STATUS "For HTTP/2 support, compile with Qt 5.9 or higher.") +endif() + if(NOT TOKEN_AUTH_ONLY) find_package(Qt5Keychain REQUIRED) endif() diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt index 12fff82ce..4244fba8c 100644 --- a/src/cmd/CMakeLists.txt +++ b/src/cmd/CMakeLists.txt @@ -27,13 +27,12 @@ endif() if(NOT BUILD_LIBRARIES_ONLY) add_executable(${cmd_NAME} ${cmd_SRC}) - qt5_use_modules(${cmd_NAME} Network ) set_target_properties(${cmd_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} ) set_target_properties(${cmd_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" ) - target_link_libraries(${cmd_NAME} ${synclib_NAME}) + target_link_libraries(${cmd_NAME} ${synclib_NAME} Qt5::Core Qt5::Network) endif() if(BUILD_OWNCLOUD_OSX_BUNDLE) diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt index b73e38fab..0d7938a34 100644 --- a/src/crashreporter/CMakeLists.txt +++ b/src/crashreporter/CMakeLists.txt @@ -32,14 +32,12 @@ if(NOT BUILD_LIBRARIES_ONLY) ${crashreporter_RC_RCC} ) - qt5_use_modules(${CRASHREPORTER_EXECUTABLE} Widgets Network) - set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES AUTOMOC ON) set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} ) set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" ) target_link_libraries(${CRASHREPORTER_EXECUTABLE} crashreporter-gui - ${QT_LIBRARIES} + Qt5::Core Qt5::Widgets ) if(BUILD_OWNCLOUD_OSX_BUNDLE) diff --git a/src/csync/CMakeLists.txt b/src/csync/CMakeLists.txt index a574f3311..2cf4e9600 100644 --- a/src/csync/CMakeLists.txt +++ b/src/csync/CMakeLists.txt @@ -50,6 +50,7 @@ set(CSYNC_LIBRARY set(CSYNC_LINK_LIBRARIES ${CSYNC_REQUIRED_LIBRARIES} ${SQLITE3_LIBRARIES} + Qt5::Core Qt5::Concurrent ) # Specific option for builds tied to servers that do not support renaming extensions @@ -133,8 +134,6 @@ if(ZLIB_FOUND) target_link_libraries(${CSYNC_LIBRARY} ZLIB::ZLIB) endif(ZLIB_FOUND) -find_package(Qt5Core REQUIRED) -qt5_use_modules(${CSYNC_LIBRARY} Core Concurrent) # For src/common/utility_mac.cpp if (APPLE) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index cee4cb457..b04159ad8 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -1,19 +1,21 @@ project(gui) +find_package(Qt5 REQUIRED COMPONENTS Widgets) set(CMAKE_AUTOMOC TRUE) - +set(CMAKE_AUTOUIC TRUE) +set(CMAKE_AUTORCC TRUE) add_subdirectory(updater) #TODO Move resources files -qt_add_resources(MIRALL_RC_SRC ../../client.qrc) +set(MIRALL_RC_SRC ../../client.qrc) if (EXISTS "${OEM_THEME_DIR}/theme.qrc") - qt_add_resources(MIRALL_RC_SRC ${OEM_THEME_DIR}/theme.qrc) + list(APPEND MIRALL_RC_SRC ${OEM_THEME_DIR}/theme.qrc) set(theme_dir ${OEM_THEME_DIR}/theme) else() - qt_add_resources(MIRALL_RC_SRC ../../theme.qrc) + list(APPEND MIRALL_RC_SRC ../../theme.qrc) set(theme_dir ${CMAKE_SOURCE_DIR}/theme) endif() -set(client_UI +set(client_UI_SRCS accountsettings.ui folderwizardsourcepage.ui folderwizardtargetpage.ui @@ -41,8 +43,6 @@ set(client_UI wizard/owncloudwizardresultpage.ui ) -qt_wrap_ui(client_UI_SRCS ${client_UI}) - set(client_SRCS accountmanager.cpp accountsettings.cpp @@ -191,8 +191,10 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) - -qt_add_translation(client_I18N ${TRANSLATIONS}) +find_package(Qt5LinguistTools) +if(Qt5LinguistTools_FOUND) + qt5_add_translation(client_I18N ${TRANSLATIONS}) +endif() IF( WIN32 ) configure_file( @@ -236,12 +238,7 @@ kde4_add_app_icon( ownCloud "${theme_dir}/colored/${APPLICATION_ICON_NAME}-*.png list(APPEND final_src ${ownCloud}) set(ownCloud ${ownCloud_old}) -if (WITH_DBUS) - set(ADDITIONAL_APP_MODULES DBus) -endif(WITH_DBUS) -if (NOT NO_SHIBBOLETH) - list(APPEND ADDITIONAL_APP_MODULES WebKitWidgets) -endif() + if(UNIX AND NOT APPLE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE") @@ -266,14 +263,12 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE) # add_executable( ${APPLICATION_EXECUTABLE} main.cpp ${final_src}) add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src}) - qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml Sql ${ADDITIONAL_APP_MODULES}) else() # set(CMAKE_INSTALL_PREFIX ".") # Examples use /Applications. hurmpf. set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns") # we must add MACOSX_BUNDLE only if building a bundle add_executable( ${APPLICATION_EXECUTABLE} WIN32 MACOSX_BUNDLE main.cpp ${final_src}) - qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml Sql ${ADDITIONAL_APP_MODULES}) set (QM_DIR ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/Translations) install(FILES ${client_I18N} DESTINATION ${QM_DIR}) @@ -291,8 +286,7 @@ else() endif() add_library(updater STATIC ${updater_SRCS} ${updaterMoc}) -target_link_libraries(updater ${synclib_NAME}) -qt5_use_modules(updater Widgets Network Xml) +target_link_libraries(updater ${synclib_NAME} Qt5::Widgets Qt5::Network Qt5::Xml) set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} @@ -301,11 +295,23 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" ) -target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} ) +target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml) target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} ) target_link_libraries( ${APPLICATION_EXECUTABLE} updater ) target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} ) +## handle DBUS for Fdo notifications +if( UNIX AND NOT APPLE ) + find_package(Qt5 COMPONENTS DBus) + target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::DBus) + target_compile_definitions(${APPLICATION_EXECUTABLE} PRIVATE "USE_FDO_NOTIFICATIONS") +endif() + +if (NOT NO_SHIBBOLETH) + find_package(Qt5 COMPONENTS WebKitWidgets) + target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::WebKitWidgets) +endif() + if(WITH_CRASHREPORTER) target_link_libraries( ${APPLICATION_EXECUTABLE} crashreporter-handler) include_directories( "../3rdparty/libcrashreporter-qt/src/" ) @@ -316,6 +322,10 @@ if(WITH_CRASHREPORTER) endif() endif() +# application.cpp still uses QDesktopServices::storageLocation +target_compile_definitions(${APPLICATION_EXECUTABLE} PRIVATE "QT_DISABLE_DEPRECATED_BEFORE=0") + + install(TARGETS ${APPLICATION_EXECUTABLE} RUNTIME DESTINATION bin LIBRARY DESTINATION lib diff --git a/src/gui/application.cpp b/src/gui/application.cpp index 8f4b3f1ba..6280c04aa 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -128,7 +128,15 @@ Application::Application(int &argc, char **argv) if (!QFileInfo(confDir).exists()) { // Migrate from version <= 2.4 setApplicationName(_theme->appNameGUI()); +#ifndef QT_WARNING_DISABLE_DEPRECATED // Was added in Qt 5.9 +#define QT_WARNING_DISABLE_DEPRECATED QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") +#endif + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED + // We need to use the deprecated QDesktopServices::storageLocation because of its Qt4 + // behavior of adding "data" to the path QString oldDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation); + QT_WARNING_POP setApplicationName(_theme->appName()); if (QFileInfo(oldDir).isDir()) { qCInfo(lcApplication) << "Migrating old config from" << oldDir << "to" << confDir; diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt index 93f3e4169..6b0633da5 100644 --- a/src/libsync/CMakeLists.txt +++ b/src/libsync/CMakeLists.txt @@ -95,11 +95,16 @@ IF (NOT APPLE) ENDIF(NOT APPLE) list(APPEND libsync_LINK_TARGETS - ${QT_LIBRARIES} ocsync ${OS_SPECIFIC_LINK_LIBRARIES} + Qt5::Core Qt5::Network ) +if (NOT TOKEN_AUTH_ONLY) + find_package(Qt5 REQUIRED COMPONENTS Widgets) + list(APPEND libsync_LINK_TARGETS Qt5::Widgets) +endif() + if(QTKEYCHAIN_FOUND OR QT5KEYCHAIN_FOUND) list(APPEND libsync_LINK_TARGETS ${QTKEYCHAIN_LIBRARY}) include_directories(${QTKEYCHAIN_INCLUDE_DIR}) @@ -118,11 +123,6 @@ GENERATE_EXPORT_HEADER( ${synclib_NAME} STATIC_DEFINE OWNCLOUD_BUILT_AS_STATIC ) -if(TOKEN_AUTH_ONLY) - qt5_use_modules(${synclib_NAME} Network) -else() - qt5_use_modules(${synclib_NAME} Widgets Network) -endif() set_target_properties( ${synclib_NAME} PROPERTIES VERSION ${MIRALL_VERSION} diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp index eb0ce8d3e..2cf096d4f 100644 --- a/src/libsync/discoveryphase.cpp +++ b/src/libsync/discoveryphase.cpp @@ -15,7 +15,6 @@ #include "discoveryphase.h" #include "account.h" -#include "theme.h" #include "common/asserts.h" #include "common/checksums.h" 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) |