7283a0afb2
properties. Update to cmake-2.8.2. While here, move to new-style LIB_DEPENDS/WANTLIB. OK espie@, landry@, sthen@
38 lines
1.2 KiB
Plaintext
38 lines
1.2 KiB
Plaintext
$OpenBSD: patch-Modules_Qt4ConfigDependentSettings_cmake,v 1.2 2010/07/12 19:19:30 dcoppa Exp $
|
|
--- Modules/Qt4ConfigDependentSettings.cmake.orig Mon Jun 28 17:15:57 2010
|
|
+++ Modules/Qt4ConfigDependentSettings.cmake Mon Jul 5 11:23:18 2010
|
|
@@ -26,6 +26,9 @@
|
|
# if a user needs the dependencies, and they couldn't be found, they can set
|
|
# the variables themselves.
|
|
|
|
+INCLUDE(FindIconv)
|
|
+INCLUDE(FindLibIntl)
|
|
+
|
|
SET(QT_QTGUI_LIB_DEPENDENCIES "")
|
|
SET(QT_QTCORE_LIB_DEPENDENCIES "")
|
|
SET(QT_QTNETWORK_LIB_DEPENDENCIES "")
|
|
@@ -68,6 +71,23 @@ ENDIF(NOT QT_IS_STATIC)
|
|
find_package(OpenGL)
|
|
SET (QT_QTOPENGL_LIB_DEPENDENCIES ${OPENGL_glu_LIBRARY} ${OPENGL_gl_LIBRARY})
|
|
|
|
+## iconv
|
|
+IF(ICONV_FOUND)
|
|
+ FIND_LIBRARY(QT_ICONV_LIBRARY NAMES iconv)
|
|
+ MARK_AS_ADVANCED(QT_ICONV_LIBRARY)
|
|
+ IF(QT_ICONV_LIBRARY)
|
|
+ SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_ICONV_LIBRARY})
|
|
+ ENDIF(QT_ICONV_LIBRARY)
|
|
+ENDIF(ICONV_FOUND)
|
|
+
|
|
+## libintl
|
|
+IF(LIBINTL_FOUND)
|
|
+ FIND_LIBRARY(QT_INTL_LIBRARY NAMES intl)
|
|
+ MARK_AS_ADVANCED(QT_INTL_LIBRARY)
|
|
+ IF(QT_INTL_LIBRARY)
|
|
+ SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_INTL_LIBRARY})
|
|
+ ENDIF(QT_INTL_LIBRARY)
|
|
+ENDIF(LIBINTL_FOUND)
|
|
|
|
## system png
|
|
IF(QT_QCONFIG MATCHES "system-png")
|