Fixed: Link errors under Linux

--HG--
branch : develop
This commit is contained in:
kervala 2015-12-25 17:59:41 +01:00
parent 4a1f4cd725
commit 1be6901176

View file

@ -259,8 +259,10 @@ IF(WITH_QT5)
ADD_QT_LIBRARY(XcbQpa) ADD_QT_LIBRARY(XcbQpa)
ADD_QT_LIBRARY(PlatformSupport) ADD_QT_LIBRARY(PlatformSupport)
SET(QT_LIBRARIES ${QT_LIBRARIES} -lX11-xcb -lXi -lSM -lICE -lxcb) SET(QT_LIBRARIES ${QT_LIBRARIES} -lX11-xcb -lXi -lSM -lICE -lxcb -lGL)
SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_LIBRARY_DIR}/libxcb-static.a") IF(EXISTS "${QT_LIBRARY_DIR}/libxcb-static.a")
SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_LIBRARY_DIR}/libxcb-static.a")
ENDIF()
SET(QT_LIBRARIES ${QT_LIBRARIES} -lfontconfig) SET(QT_LIBRARIES ${QT_LIBRARIES} -lfontconfig)
ADD_QT_LIBRARY(DBus) ADD_QT_LIBRARY(DBus)
ENDIF() ENDIF()
@ -332,7 +334,7 @@ IF(WITH_QT5)
${CARBON_FRAMEWORK} ${CARBON_FRAMEWORK}
${SECURITY_FRAMEWORK}) ${SECURITY_FRAMEWORK})
ELSEIF(UNIX) ELSEIF(UNIX)
SET(QT_LIBRARIES ${QT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -ldl) SET(QT_LIBRARIES ${QT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -ldl -lrt)
ENDIF() ENDIF()
ELSE() ELSE()
SET(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::Xml Qt5::Gui Qt5::OpenGL Qt5::Core) SET(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::Xml Qt5::Gui Qt5::OpenGL Qt5::Core)