From 5896aeb7e495b423d4bd5b8f5fe36f67dd0bd86a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= <sebastien.blin@savoirfairelinux.com> Date: Mon, 11 Jun 2018 11:03:10 -0400 Subject: [PATCH] build: use target_link_libraries instead of QT5_USE_MODULES QT5_USE_MODULES is deprecated and will be removed Source: https://doc.qt.io/qt-5/cmake-manual.html Change-Id: Idf92f6019f1cdab5c9176acd6321ba145579d7e2 Gitlab: #363 --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2dfb1b42..902a76fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -695,7 +695,7 @@ ADD_LIBRARY( ringclient SHARED ${libringclient_LIB_SRCS} ${LIB_HEADER_MOC} ) IF(NOT ${ENABLE_STATIC} MATCHES false) ADD_LIBRARY( ringclient_static STATIC ${libringclient_LIB_SRCS} ${LIB_HEADER_MOC} ) - QT5_USE_MODULES(ringclient_static Core) + target_link_libraries(ringclient_static Qt5::Core) TARGET_LINK_LIBRARIES( ringclient_static -lpthread ${QT_QTDBUS_LIBRARY} @@ -707,18 +707,18 @@ IF(NOT ${ENABLE_STATIC} MATCHES false) ) ENDIF() -QT5_USE_MODULES(ringclient Core) +target_link_libraries(ringclient Qt5::Core) IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - QT5_USE_MODULES(ringclient DBus) + target_link_libraries(ringclient Qt5::DBus) IF(NOT ${ENABLE_STATIC} MATCHES false) - QT5_USE_MODULES(ringclient_static DBus) + target_link_libraries(ringclient_static Qt5::DBus) ENDIF() ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows") FIND_PACKAGE(Qt5Concurrent) #For some reason, QSemaphore wont compile on Windows without QtConcurrent - QT5_USE_MODULES(ringclient Concurrent) + target_link_libraries(ringclient Qt5::Concurrent) ENDIF() -- GitLab