Skip to content
Snippets Groups Projects
Commit 5896aeb7 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

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
parent 103d9c1a
No related branches found
No related tags found
No related merge requests found
...@@ -695,7 +695,7 @@ ADD_LIBRARY( ringclient SHARED ${libringclient_LIB_SRCS} ${LIB_HEADER_MOC} ) ...@@ -695,7 +695,7 @@ ADD_LIBRARY( ringclient SHARED ${libringclient_LIB_SRCS} ${LIB_HEADER_MOC} )
IF(NOT ${ENABLE_STATIC} MATCHES false) IF(NOT ${ENABLE_STATIC} MATCHES false)
ADD_LIBRARY( ringclient_static STATIC ${libringclient_LIB_SRCS} ${LIB_HEADER_MOC} ) 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 TARGET_LINK_LIBRARIES( ringclient_static
-lpthread -lpthread
${QT_QTDBUS_LIBRARY} ${QT_QTDBUS_LIBRARY}
...@@ -707,18 +707,18 @@ IF(NOT ${ENABLE_STATIC} MATCHES false) ...@@ -707,18 +707,18 @@ IF(NOT ${ENABLE_STATIC} MATCHES false)
) )
ENDIF() ENDIF()
QT5_USE_MODULES(ringclient Core) target_link_libraries(ringclient Qt5::Core)
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
QT5_USE_MODULES(ringclient DBus) target_link_libraries(ringclient Qt5::DBus)
IF(NOT ${ENABLE_STATIC} MATCHES false) IF(NOT ${ENABLE_STATIC} MATCHES false)
QT5_USE_MODULES(ringclient_static DBus) target_link_libraries(ringclient_static Qt5::DBus)
ENDIF() ENDIF()
ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows") ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
FIND_PACKAGE(Qt5Concurrent) FIND_PACKAGE(Qt5Concurrent)
#For some reason, QSemaphore wont compile on Windows without QtConcurrent #For some reason, QSemaphore wont compile on Windows without QtConcurrent
QT5_USE_MODULES(ringclient Concurrent) target_link_libraries(ringclient Qt5::Concurrent)
ENDIF() ENDIF()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment