X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=cmake%2Fmodules%2FQt4ConfigDependentSettings.cmake;h=338b9012961b5313e707d3d6fb98139cf2ec1e4b;hb=4146abb352834db6537acc45e102defa9ed7a2f8;hp=1956aa5a4c31205dd3ec3587957cf755da82422b;hpb=ad524dacd08f1703999df472e728a736bf5bc083;p=quassel.git diff --git a/cmake/modules/Qt4ConfigDependentSettings.cmake b/cmake/modules/Qt4ConfigDependentSettings.cmake index 1956aa5a..338b9012 100644 --- a/cmake/modules/Qt4ConfigDependentSettings.cmake +++ b/cmake/modules/Qt4ConfigDependentSettings.cmake @@ -27,7 +27,7 @@ IF(UNIX) # on OS X X11 may not be required IF (Q_WS_X11) - FIND_PACKAGE(X11 REQUIRED) + FIND_PACKAGE(X11) ENDIF (Q_WS_X11) FIND_PACKAGE(Threads) SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) @@ -57,9 +57,9 @@ ELSE(WIN32) # On other platforms, check file extension to know if its static IF(QT_QTCORE_LIBRARY_RELEASE) GET_FILENAME_COMPONENT(qtcore_lib_ext "${QT_QTCORE_LIBRARY_RELEASE}" EXT) - IF(${qtcore_lib_ext} STREQUAL ${CMAKE_STATIC_LIBRARY_SUFFIX}) + IF("${qtcore_lib_ext}" STREQUAL "${CMAKE_STATIC_LIBRARY_SUFFIX}") SET(QT_IS_STATIC 1) - ENDIF(${qtcore_lib_ext} STREQUAL ${CMAKE_STATIC_LIBRARY_SUFFIX}) + ENDIF("${qtcore_lib_ext}" STREQUAL "${CMAKE_STATIC_LIBRARY_SUFFIX}") ENDIF(QT_QTCORE_LIBRARY_RELEASE) IF(QT_QTCORE_LIBRARY_DEBUG) GET_FILENAME_COMPONENT(qtcore_lib_ext "${QT_QTCORE_LIBRARY_DEBUG}" EXT) @@ -217,6 +217,7 @@ IF(NOT Q_WS_WIN) ENDIF(_QT_NEED_OPENSSL) ENDIF(NOT Q_WS_WIN) + ## dbus IF(QT_QCONFIG MATCHES "dbus")