From 14509a5fab6ac84d825b8fc834633d37c524232f Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Sun, 15 Nov 2009 18:08:02 +0000
Subject: -more syncing with cmake: split some logic of FindQt4.cmake into
 separate files Qt4Macros.cmake and Qt4ConfigDependentSettings.cmake, which
 are automatically included by FindQt4.cmake. -no functional changes

Alex


svn path=/trunk/KDE/kdelibs/; revision=1049722
---
 modules/Qt4ConfigDependentSettings.cmake | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 modules/Qt4ConfigDependentSettings.cmake

(limited to 'modules/Qt4ConfigDependentSettings.cmake')

diff --git a/modules/Qt4ConfigDependentSettings.cmake b/modules/Qt4ConfigDependentSettings.cmake
new file mode 100644
index 00000000..4aac513a
--- /dev/null
+++ b/modules/Qt4ConfigDependentSettings.cmake
@@ -0,0 +1,32 @@
+# This file is included by FindQt4.cmake, don't include it directly.
+
+#=============================================================================
+# Copyright 2005-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+
+###############################################
+#
+#       configuration/system dependent settings  
+#
+###############################################
+
+# for unix add X11 stuff
+IF(UNIX)
+  # on OS X X11 may not be required
+  IF (Q_WS_X11)
+    FIND_PACKAGE(X11 REQUIRED)
+  ENDIF (Q_WS_X11)
+  FIND_PACKAGE(Threads)
+  SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+ENDIF(UNIX)
+
-- 
cgit v1.2.1


From eb0612652833020ea9cf43531ee744ae985537fa Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Sun, 15 Nov 2009 18:12:27 +0000
Subject: -sync with cmake: move -DQT_DLL into Qt4ConfigDependentSettings.cmake

Alex


svn path=/trunk/KDE/kdelibs/; revision=1049724
---
 modules/Qt4ConfigDependentSettings.cmake | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'modules/Qt4ConfigDependentSettings.cmake')

diff --git a/modules/Qt4ConfigDependentSettings.cmake b/modules/Qt4ConfigDependentSettings.cmake
index 4aac513a..77fa4572 100644
--- a/modules/Qt4ConfigDependentSettings.cmake
+++ b/modules/Qt4ConfigDependentSettings.cmake
@@ -30,3 +30,6 @@ IF(UNIX)
   SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
 ENDIF(UNIX)
 
+IF (WIN32)
+  SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_DLL)
+ENDIF(WIN32)
-- 
cgit v1.2.1


From 3555d826506052b56c74db242c71c8faf5fdbf9c Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Sun, 15 Nov 2009 18:22:28 +0000
Subject: -more syncing with cmake: make UseQt4.cmake work with the KDE version
 of FindQt4.cmake, i.e. detect the additional dependencies

Alex


svn path=/trunk/KDE/kdelibs/; revision=1049728
---
 modules/Qt4ConfigDependentSettings.cmake | 323 ++++++++++++++++++++++++++++++-
 1 file changed, 321 insertions(+), 2 deletions(-)

(limited to 'modules/Qt4ConfigDependentSettings.cmake')

diff --git a/modules/Qt4ConfigDependentSettings.cmake b/modules/Qt4ConfigDependentSettings.cmake
index 77fa4572..d67c6faa 100644
--- a/modules/Qt4ConfigDependentSettings.cmake
+++ b/modules/Qt4ConfigDependentSettings.cmake
@@ -20,6 +20,9 @@
 #
 ###############################################
 
+# this check for X11 and threads may not be necessary, since it is not 
+# contained in the cmake version of FindQt4.cmake:
+
 # for unix add X11 stuff
 IF(UNIX)
   # on OS X X11 may not be required
@@ -30,6 +33,322 @@ IF(UNIX)
   SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
 ENDIF(UNIX)
 
-IF (WIN32)
+
+# 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 "")
+SET(QT_QTNETWORK_LIB_DEPENDENCIES "")
+SET(QT_QTOPENGL_LIB_DEPENDENCIES "")
+SET(QT_QTDBUS_LIB_DEPENDENCIES "")
+SET(QT_QTHELP_LIB_DEPENDENCIES ${QT_QTCLUCENE_LIBRARY})
+
+
+# build using shared Qt needs -DQT_DLL
+IF(WIN32  AND  NOT QT_CONFIG MATCHES "static")
+  # warning currently only qconfig.pri on Windows potentially contains "static"
+  # so QT_DLL might not get defined properly on other platforms.
   SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_DLL)
-ENDIF(WIN32)
+ENDIF(WIN32  AND  NOT QT_CONFIG MATCHES "static")
+
+
+# QtOpenGL dependencies
+QT_QUERY_QMAKE(QMAKE_LIBS_OPENGL "QMAKE_LIBS_OPENGL")
+SET (QT_QTOPENGL_LIB_DEPENDENCIES ${QT_QTOPENGL_LIB_DEPENDENCIES} ${QMAKE_LIBS_OPENGL})
+
+
+## system png
+IF(QT_QCONFIG MATCHES "system-png")
+  FIND_LIBRARY(QT_PNG_LIBRARY NAMES png)
+  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
+IF(Q_WS_X11)
+  QT_QUERY_QMAKE(QMAKE_LIBDIR_X11 "QMAKE_LIBDIR_X11")
+ENDIF(Q_WS_X11)
+
+
+## X11 SM
+IF(QT_QCONFIG MATCHES "x11sm")
+  # 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})
+  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})
+  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})
+  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})
+  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})
+  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})
+  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})
+  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)
+  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)
+  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)
+  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(NOT Q_WS_WIN)
+  SET(_QT_NEED_OPENSSL 0)
+  IF(QT_VERSION_MINOR LESS 4 AND QT_QCONFIG MATCHES "openssl")
+    SET(_QT_NEED_OPENSSL 1)
+  ENDIF(QT_VERSION_MINOR LESS 4 AND QT_QCONFIG MATCHES "openssl")
+  IF(QT_VERSION_MINOR GREATER 3 AND QT_QCONFIG MATCHES "openssl-linked")
+    SET(_QT_NEED_OPENSSL 1)
+  ENDIF(QT_VERSION_MINOR GREATER 3 AND QT_QCONFIG MATCHES "openssl-linked")
+  IF(_QT_NEED_OPENSSL)
+    FIND_PACKAGE(OpenSSL)
+    IF(OPENSSL_LIBRARIES)
+      SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
+    ENDIF(OPENSSL_LIBRARIES)
+  ENDIF(_QT_NEED_OPENSSL)
+ENDIF(NOT Q_WS_WIN)
+
+
+## dbus
+IF(QT_QCONFIG MATCHES "dbus")
+
+  # if the dbus library isn't found, we'll assume its not required to build
+  # shared Qt on Linux doesn't require it
+  IF(NOT QT_DBUS_LIBRARY)
+    EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L dbus-1
+      OUTPUT_VARIABLE _dbus_query_output
+      RESULT_VARIABLE _dbus_result
+      ERROR_VARIABLE _dbus_query_output )
+
+    IF(_dbus_result MATCHES 0)
+      STRING(REPLACE "-L" "" _dbus_query_output "${_dbus_query_output}")
+      SEPARATE_ARGUMENTS(_dbus_query_output)
+    ELSE(_dbus_result MATCHES 0)
+      SET(_dbus_query_output)
+    ENDIF(_dbus_result MATCHES 0)
+
+    FIND_LIBRARY(QT_DBUS_LIBRARY NAMES dbus-1 PATHS ${_dbus_query_output} )
+
+    IF(QT_DBUS_LIBRARY)
+      SET(QT_QTDBUS_LIB_DEPENDENCIES ${QT_QTDBUS_LIB_DEPENDENCIES} ${QT_DBUS_LIBRARY})
+    ENDIF(QT_DBUS_LIBRARY)
+
+    MARK_AS_ADVANCED(QT_DBUS_LIBRARY)
+  ENDIF(NOT QT_DBUS_LIBRARY)
+
+ENDIF(QT_QCONFIG MATCHES "dbus")
+
+
+## glib
+IF(QT_QCONFIG MATCHES "glib")
+
+  # if the glib libraries aren't found, we'll assume its not required to build
+  # shared Qt on Linux doesn't require it
+
+  # Qt 4.2.0+ uses glib-2.0
+  IF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
+    EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L glib-2.0 gthread-2.0
+      OUTPUT_VARIABLE _glib_query_output
+      RESULT_VARIABLE _glib_result
+      ERROR_VARIABLE _glib_query_output )
+
+    IF(_glib_result MATCHES 0)
+      STRING(REPLACE "-L" "" _glib_query_output "${_glib_query_output}")
+      SEPARATE_ARGUMENTS(_glib_query_output)
+    ELSE(_glib_result MATCHES 0)
+      SET(_glib_query_output)
+    ENDIF(_glib_result MATCHES 0)
+
+    FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0 PATHS ${_glib_query_output} )
+    FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0 PATHS ${_glib_query_output} )
+
+    MARK_AS_ADVANCED(QT_GLIB_LIBRARY)
+    MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY)
+  ENDIF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
+
+  IF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
+    SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES}
+        ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY})
+  ENDIF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
+
+
+  # Qt 4.5+ also links to gobject-2.0
+  IF(QT_VERSION_MINOR GREATER 4)
+     IF(NOT QT_GOBJECT_LIBRARY)
+       EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L gobject-2.0
+         OUTPUT_VARIABLE _glib_query_output
+         RESULT_VARIABLE _glib_result
+         ERROR_VARIABLE _glib_query_output )
+
+       IF(_glib_result MATCHES 0)
+         STRING(REPLACE "-L" "" _glib_query_output "${_glib_query_output}")
+         SEPARATE_ARGUMENTS(_glib_query_output)
+       ELSE(_glib_result MATCHES 0)
+         SET(_glib_query_output)
+       ENDIF(_glib_result MATCHES 0)
+
+       FIND_LIBRARY(QT_GOBJECT_LIBRARY NAMES gobject-2.0 PATHS ${_glib_query_output} )
+
+       MARK_AS_ADVANCED(QT_GOBJECT_LIBRARY)
+     ENDIF(NOT QT_GOBJECT_LIBRARY)
+
+     IF(QT_GOBJECT_LIBRARY)
+       SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES}
+           ${QT_GOBJECT_LIBRARY})
+     ENDIF(QT_GOBJECT_LIBRARY)
+  ENDIF(QT_VERSION_MINOR GREATER 4)
+
+ENDIF(QT_QCONFIG MATCHES "glib")
+
+
+## clock-monotonic, just see if we need to link with rt
+IF(QT_QCONFIG MATCHES "clock-monotonic")
+  SET(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES})
+  SET(CMAKE_REQUIRED_LIBRARIES rt)
+  CHECK_SYMBOL_EXISTS(_POSIX_TIMERS "unistd.h;time.h" QT_POSIX_TIMERS)
+  SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE})
+  IF(QT_POSIX_TIMERS)
+    FIND_LIBRARY(QT_RT_LIBRARY NAMES rt)
+    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")
+
+
+IF(Q_WS_X11)
+  # X11 libraries Qt absolutely depends on
+  QT_QUERY_QMAKE(QT_LIBS_X11 "QMAKE_LIBS_X11")
+  SEPARATE_ARGUMENTS(QT_LIBS_X11)
+  FOREACH(QT_X11_LIB ${QT_LIBS_X11})
+    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})
+    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")
+  SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_LIBS_THREAD})
+
+  QT_QUERY_QMAKE(QMAKE_LIBS_DYNLOAD "QMAKE_LIBS_DYNLOAD")
+  SET (QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QMAKE_LIBS_DYNLOAD})
+
+ENDIF(Q_WS_X11)
+
+
+IF(Q_WS_WIN)
+  SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} imm32 winmm)
+  SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ws2_32)
+ENDIF(Q_WS_WIN)
+
+
+IF(Q_WS_MAC)
+  SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework Carbon")
+
+  # Qt 4.0, 4.1, 4.2 use QuickTime
+  IF(QT_VERSION_MINOR LESS 3)
+    SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework QuickTime")
+  ENDIF(QT_VERSION_MINOR LESS 3)
+
+  # Qt 4.2+ use AppKit
+  IF(QT_VERSION_MINOR GREATER 1)
+    SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework AppKit")
+  ENDIF(QT_VERSION_MINOR GREATER 1)
+
+  SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} "-framework ApplicationServices")
+ENDIF(Q_WS_MAC)
+
-- 
cgit v1.2.1


From cc812d58d28318572719e1ced02b91f6b27cee34 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Wed, 18 Nov 2009 22:49:24 +0000
Subject: -keep in sync with cmake: don't let whitespace-separated libs slip
 into the variables

Alex


svn path=/trunk/KDE/kdelibs/; revision=1051144
---
 modules/Qt4ConfigDependentSettings.cmake | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules/Qt4ConfigDependentSettings.cmake')

diff --git a/modules/Qt4ConfigDependentSettings.cmake b/modules/Qt4ConfigDependentSettings.cmake
index d67c6faa..55f7097f 100644
--- a/modules/Qt4ConfigDependentSettings.cmake
+++ b/modules/Qt4ConfigDependentSettings.cmake
@@ -59,6 +59,7 @@ ENDIF(WIN32  AND  NOT QT_CONFIG MATCHES "static")
 
 # QtOpenGL dependencies
 QT_QUERY_QMAKE(QMAKE_LIBS_OPENGL "QMAKE_LIBS_OPENGL")
+SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
 SET (QT_QTOPENGL_LIB_DEPENDENCIES ${QT_QTOPENGL_LIB_DEPENDENCIES} ${QMAKE_LIBS_OPENGL})
 
 
-- 
cgit v1.2.1


From e741edda28738c99531df34980ebb0b00bdc27e8 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Sat, 19 Dec 2009 14:33:24 +0000
Subject: -keep in sync with Qt4 from cmake

Alex


svn path=/trunk/KDE/kdelibs/; revision=1063890
---
 modules/Qt4ConfigDependentSettings.cmake | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

(limited to 'modules/Qt4ConfigDependentSettings.cmake')

diff --git a/modules/Qt4ConfigDependentSettings.cmake b/modules/Qt4ConfigDependentSettings.cmake
index 55f7097f..f6062a74 100644
--- a/modules/Qt4ConfigDependentSettings.cmake
+++ b/modules/Qt4ConfigDependentSettings.cmake
@@ -36,8 +36,7 @@ ENDIF(UNIX)
 
 # 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
+# when doing builds against a shared Qt, they are not required
 # if a user needs the dependencies, and they couldn't be found, they can set
 # the variables themselves.
 
@@ -49,12 +48,31 @@ SET(QT_QTDBUS_LIB_DEPENDENCIES "")
 SET(QT_QTHELP_LIB_DEPENDENCIES ${QT_QTCLUCENE_LIBRARY})
 
 
-# build using shared Qt needs -DQT_DLL
-IF(WIN32  AND  NOT QT_CONFIG MATCHES "static")
-  # warning currently only qconfig.pri on Windows potentially contains "static"
-  # so QT_DLL might not get defined properly on other platforms.
+IF(WIN32)
+  # On Windows, qconfig.pri has "static" for static library builds
+  IF(QT_CONFIG MATCHES "static")
+    SET(QT_IS_STATIC 1)
+  ENDIF(QT_CONFIG MATCHES "static")
+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})
+      SET(QT_IS_STATIC 1)
+    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)
+    IF(${qtcore_lib_ext} STREQUAL ${CMAKE_STATIC_LIBRARY_SUFFIX})
+      SET(QT_IS_STATIC 1)
+    ENDIF(${qtcore_lib_ext} STREQUAL ${CMAKE_STATIC_LIBRARY_SUFFIX})
+  ENDIF(QT_QTCORE_LIBRARY_DEBUG)
+ENDIF(WIN32)
+
+# build using shared Qt needs -DQT_DLL on Windows
+IF(WIN32  AND  NOT QT_IS_STATIC)
   SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_DLL)
-ENDIF(WIN32  AND  NOT QT_CONFIG MATCHES "static")
+ENDIF(WIN32  AND  NOT QT_IS_STATIC)
 
 
 # QtOpenGL dependencies
-- 
cgit v1.2.1


From 4a956a832abbb1971d41375328bf71dad27a03f1 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Mon, 18 Jan 2010 22:12:36 +0000
Subject: -fix two remaining compat. issues found by the cmake devs: -- the
 imported targets did not work with Qt installed as frameworks on OSX -- if a
 project exported its libraries, and these libraries depend on Qt libs, but
 the installed FooConfig.cmake files    do not load FindQt4.cmake, this would
 result in unknown targets "Qt4::QtCore" etc. So now there is a switch    to
 enable the imported targets explicitely (what we do for KDE)

Alex


svn path=/trunk/KDE/kdelibs/; revision=1076819
---
 modules/Qt4ConfigDependentSettings.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/Qt4ConfigDependentSettings.cmake')

diff --git a/modules/Qt4ConfigDependentSettings.cmake b/modules/Qt4ConfigDependentSettings.cmake
index f6062a74..d6fc2d44 100644
--- a/modules/Qt4ConfigDependentSettings.cmake
+++ b/modules/Qt4ConfigDependentSettings.cmake
@@ -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)
-- 
cgit v1.2.1


From 6ec201b2310c9d1f8dd947d2c90ff782568f0cd7 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Sun, 7 Mar 2010 22:23:07 +0000
Subject: -fix build on OSX with OpenGL  (don't turn "-framework foo" into
 "-framework;-lfoo"

Alex


svn path=/trunk/KDE/kdelibs/; revision=1100585
---
 modules/Qt4ConfigDependentSettings.cmake | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'modules/Qt4ConfigDependentSettings.cmake')

diff --git a/modules/Qt4ConfigDependentSettings.cmake b/modules/Qt4ConfigDependentSettings.cmake
index d6fc2d44..b5462e7b 100644
--- a/modules/Qt4ConfigDependentSettings.cmake
+++ b/modules/Qt4ConfigDependentSettings.cmake
@@ -77,7 +77,18 @@ ENDIF(WIN32  AND  NOT QT_IS_STATIC)
 
 # QtOpenGL dependencies
 QT_QUERY_QMAKE(QMAKE_LIBS_OPENGL "QMAKE_LIBS_OPENGL")
-SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
+IF(Q_WS_MAC)
+# On the Mac OpenGL is probably frameworks and QMAKE_LIBS_OPENGL can be e.g. "-framework OpenGL -framework AGL".
+# The separate_arguments() call in the other branch makes "-framework;-OpenGL;-framework;-lAGL" appear in the 
+# linker command. So we need to protect the "-framework foo" as non-separatable strings.
+# We do this by replacing the space after "-framework" with an underscore, then calling separate_arguments(),
+# and then we replace the underscores again with spaces. So we get proper linker commands. Alex
+  STRING(REGEX REPLACE "-framework +" "-framework_" QMAKE_LIBS_OPENGL "${QMAKE_LIBS_OPENGL}")
+  SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
+  STRING(REGEX REPLACE "-framework_" "-framework " QMAKE_LIBS_OPENGL "${QMAKE_LIBS_OPENGL}")
+ELSE(Q_WS_MAC)
+  SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
+ENDIF(Q_WS_MAC)
 SET (QT_QTOPENGL_LIB_DEPENDENCIES ${QT_QTOPENGL_LIB_DEPENDENCIES} ${QMAKE_LIBS_OPENGL})
 
 
-- 
cgit v1.2.1