ENH: Some Linux distros don't install xorg-devel, png-devel, etc... when
qt4-devel is installed. Finding them was required to support building
against static Qt. Changing it so they are ignored if not found.
This commit is contained in:
Clinton Stimpson
parent
2453164126
commit
7676ac8891
|
|
@ -1356,6 +1356,13 @@ IF (QT4_QMAKE_FOUND)
|
|||
# configuration/system dependent settings
|
||||
#
|
||||
###############################################
|
||||
|
||||
# find dependencies for some Qt modules
|
||||
# when doing builds against a static Qt, they are required
|
||||
# when doing builds against a shared Qt, they are sometimes not required
|
||||
# even some Linux distros do not require these dependencies
|
||||
# if a user needs the dependencies, and they couldn't be found, they can set
|
||||
# the variables themselves.
|
||||
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES "")
|
||||
SET(QT_QTCORE_LIB_DEPENDENCIES "")
|
||||
|
|
@ -1378,8 +1385,10 @@ IF (QT4_QMAKE_FOUND)
|
|||
## system png
|
||||
IF(QT_QCONFIG MATCHES "system-png")
|
||||
FIND_LIBRARY(QT_PNG_LIBRARY NAMES png)
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_PNG_LIBRARY})
|
||||
MARK_AS_ADVANCED(QT_PNG_LIBRARY)
|
||||
IF(QT_PNG_LIBRARY)
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_PNG_LIBRARY})
|
||||
ENDIF(QT_PNG_LIBRARY)
|
||||
ENDIF(QT_QCONFIG MATCHES "system-png")
|
||||
|
||||
# for X11, get X11 library directory
|
||||
|
|
@ -1392,78 +1401,100 @@ IF (QT4_QMAKE_FOUND)
|
|||
# ask qmake where the x11 libs are
|
||||
FIND_LIBRARY(QT_X11_SM_LIBRARY NAMES SM PATHS ${QMAKE_LIBDIR_X11})
|
||||
FIND_LIBRARY(QT_X11_ICE_LIBRARY NAMES ICE PATHS ${QMAKE_LIBDIR_X11})
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_X11_SM_LIBRARY} ${QT_X11_ICE_LIBRARY})
|
||||
MARK_AS_ADVANCED(QT_X11_SM_LIBRARY)
|
||||
MARK_AS_ADVANCED(QT_X11_ICE_LIBRARY)
|
||||
IF(QT_X11_SM_LIBRARY AND QT_X11_ICE_LIBRARY)
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_X11_SM_LIBRARY} ${QT_X11_ICE_LIBRARY})
|
||||
ENDIF(QT_X11_SM_LIBRARY AND QT_X11_ICE_LIBRARY)
|
||||
ENDIF(QT_QCONFIG MATCHES "x11sm")
|
||||
|
||||
## Xi
|
||||
IF(QT_QCONFIG MATCHES "tablet")
|
||||
FIND_LIBRARY(QT_XI_LIBRARY NAMES Xi PATHS ${QMAKE_LIBDIR_X11})
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XI_LIBRARY})
|
||||
MARK_AS_ADVANCED(QT_XI_LIBRARY)
|
||||
IF(QT_XI_LIBRARY)
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XI_LIBRARY})
|
||||
ENDIF(QT_XI_LIBRARY)
|
||||
ENDIF(QT_QCONFIG MATCHES "tablet")
|
||||
|
||||
## Xrender
|
||||
IF(QT_QCONFIG MATCHES "xrender")
|
||||
FIND_LIBRARY(QT_XRENDER_LIBRARY NAMES Xrender PATHS ${QMAKE_LIBDIR_X11})
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRENDER_LIBRARY})
|
||||
MARK_AS_ADVANCED(QT_XRENDER_LIBRARY)
|
||||
IF(QT_XRENDER_LIBRARY)
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRENDER_LIBRARY})
|
||||
ENDIF(QT_XRENDER_LIBRARY)
|
||||
ENDIF(QT_QCONFIG MATCHES "xrender")
|
||||
|
||||
## Xrandr
|
||||
IF(QT_QCONFIG MATCHES "xrandr")
|
||||
FIND_LIBRARY(QT_XRANDR_LIBRARY NAMES Xrandr PATHS ${QMAKE_LIBDIR_X11})
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRANDR_LIBRARY})
|
||||
MARK_AS_ADVANCED(QT_XRANDR_LIBRARY)
|
||||
IF(QT_XRANDR_LIBRARY)
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRANDR_LIBRARY})
|
||||
ENDIF(QT_XRANDR_LIBRARY)
|
||||
ENDIF(QT_QCONFIG MATCHES "xrandr")
|
||||
|
||||
## Xcursor
|
||||
IF(QT_QCONFIG MATCHES "xcursor")
|
||||
FIND_LIBRARY(QT_XCURSOR_LIBRARY NAMES Xcursor PATHS ${QMAKE_LIBDIR_X11})
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XCURSOR_LIBRARY})
|
||||
MARK_AS_ADVANCED(QT_XCURSOR_LIBRARY)
|
||||
IF(QT_XCURSOR_LIBRARY)
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XCURSOR_LIBRARY})
|
||||
ENDIF(QT_XCURSOR_LIBRARY)
|
||||
ENDIF(QT_QCONFIG MATCHES "xcursor")
|
||||
|
||||
## Xinerama
|
||||
IF(QT_QCONFIG MATCHES "xinerama")
|
||||
FIND_LIBRARY(QT_XINERAMA_LIBRARY NAMES Xinerama PATHS ${QMAKE_LIBDIR_X11})
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XINERAMA_LIBRARY})
|
||||
MARK_AS_ADVANCED(QT_XINERAMA_LIBRARY)
|
||||
IF(QT_XINERAMA_LIBRARY)
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XINERAMA_LIBRARY})
|
||||
ENDIF(QT_XINERAMA_LIBRARY)
|
||||
ENDIF(QT_QCONFIG MATCHES "xinerama")
|
||||
|
||||
## Xfixes
|
||||
IF(QT_QCONFIG MATCHES "xfixes")
|
||||
FIND_LIBRARY(QT_XFIXES_LIBRARY NAMES Xfixes PATHS ${QMAKE_LIBDIR_X11})
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XFIXES_LIBRARY})
|
||||
MARK_AS_ADVANCED(QT_XFIXES_LIBRARY)
|
||||
IF(QT_XFIXES_LIBRARY)
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XFIXES_LIBRARY})
|
||||
ENDIF(QT_XFIXES_LIBRARY)
|
||||
ENDIF(QT_QCONFIG MATCHES "xfixes")
|
||||
|
||||
## system-freetype
|
||||
IF(QT_QCONFIG MATCHES "system-freetype")
|
||||
FIND_LIBRARY(QT_FREETYPE_LIBRARY NAMES freetype)
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_FREETYPE_LIBRARY})
|
||||
MARK_AS_ADVANCED(QT_FREETYPE_LIBRARY)
|
||||
IF(QT_FREETYPE_LIBRARY)
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_FREETYPE_LIBRARY})
|
||||
ENDIF(QT_FREETYPE_LIBRARY)
|
||||
ENDIF(QT_QCONFIG MATCHES "system-freetype")
|
||||
|
||||
## fontconfig
|
||||
IF(QT_QCONFIG MATCHES "fontconfig")
|
||||
FIND_LIBRARY(QT_FONTCONFIG_LIBRARY NAMES fontconfig)
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_FONTCONFIG_LIBRARY})
|
||||
MARK_AS_ADVANCED(QT_FONTCONFIG_LIBRARY)
|
||||
IF(QT_FONTCONFIG_LIBRARY)
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_FONTCONFIG_LIBRARY})
|
||||
ENDIF(QT_FONTCONFIG_LIBRARY)
|
||||
ENDIF(QT_QCONFIG MATCHES "fontconfig")
|
||||
|
||||
## system-zlib
|
||||
IF(QT_QCONFIG MATCHES "system-zlib")
|
||||
FIND_LIBRARY(QT_ZLIB_LIBRARY NAMES z)
|
||||
SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_ZLIB_LIBRARY})
|
||||
MARK_AS_ADVANCED(QT_ZLIB_LIBRARY)
|
||||
IF(QT_ZLIB_LIBRARY)
|
||||
SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_ZLIB_LIBRARY})
|
||||
ENDIF(QT_ZLIB_LIBRARY)
|
||||
ENDIF(QT_QCONFIG MATCHES "system-zlib")
|
||||
|
||||
## openssl
|
||||
IF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
|
||||
FIND_PACKAGE(OpenSSL)
|
||||
SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
|
||||
IF(OPENSSL_LIBRARIES)
|
||||
SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
|
||||
ENDIF(OPENSSL_LIBRARIES)
|
||||
ENDIF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
|
||||
|
||||
## qdbus
|
||||
|
|
@ -1536,8 +1567,10 @@ IF (QT4_QMAKE_FOUND)
|
|||
SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE})
|
||||
IF(QT_POSIX_TIMERS)
|
||||
FIND_LIBRARY(QT_RT_LIBRARY NAMES rt)
|
||||
SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_RT_LIBRARY})
|
||||
MARK_AS_ADVANCED(QT_RT_LIBRARY)
|
||||
IF(QT_RT_LIBRARY)
|
||||
SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_RT_LIBRARY})
|
||||
ENDIF(QT_RT_LIBRARY)
|
||||
ENDIF(QT_POSIX_TIMERS)
|
||||
ENDIF(QT_QCONFIG MATCHES "clock-monotonic")
|
||||
|
||||
|
|
@ -1549,8 +1582,10 @@ IF (QT4_QMAKE_FOUND)
|
|||
STRING(REGEX REPLACE "-l" "" QT_X11_LIB "${QT_X11_LIB}")
|
||||
SET(QT_TMP_STR "QT_X11_${QT_X11_LIB}_LIBRARY")
|
||||
FIND_LIBRARY(${QT_TMP_STR} NAMES "${QT_X11_LIB}" PATHS ${QMAKE_LIBDIR_X11})
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${${QT_TMP_STR}})
|
||||
MARK_AS_ADVANCED(${QT_TMP_STR})
|
||||
IF(${QT_TMP_STR})
|
||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${${QT_TMP_STR}})
|
||||
ENDIF(${QT_TMP_STR})
|
||||
ENDFOREACH(QT_X11_LIB)
|
||||
|
||||
QT_QUERY_QMAKE(QT_LIBS_THREAD "QMAKE_LIBS_THREAD")
|
||||
|
|
|
|||
Loading…
Reference in New Issue