projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import Transiflex translations de, fi, sv
[quassel.git]
/
cmake
/
modules
/
Qt4ConfigDependentSettings.cmake
diff --git
a/cmake/modules/Qt4ConfigDependentSettings.cmake
b/cmake/modules/Qt4ConfigDependentSettings.cmake
index
925ab94
..
338b901
100644
(file)
--- 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)
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})
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)
# 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)
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)
ENDIF(QT_QTCORE_LIBRARY_RELEASE)
IF(QT_QTCORE_LIBRARY_DEBUG)
GET_FILENAME_COMPONENT(qtcore_lib_ext "${QT_QTCORE_LIBRARY_DEBUG}" EXT)
@@
-217,10
+217,6
@@
IF(NOT Q_WS_WIN)
ENDIF(_QT_NEED_OPENSSL)
ENDIF(NOT Q_WS_WIN)
ENDIF(_QT_NEED_OPENSSL)
ENDIF(NOT Q_WS_WIN)
-# Added by Sput. Still need to figure out why win is ignored upstream for this...
-IF(NOT QT_QCONFIG MATCHES "openssl")
- SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_NO_OPENSSL)
-ENDIF(NOT QT_QCONFIG MATCHES "openssl")
## dbus
IF(QT_QCONFIG MATCHES "dbus")
## dbus
IF(QT_QCONFIG MATCHES "dbus")