[Cmake-commits] CMake branch, next, updated. v2.8.3-702-g5b1b47d

[Clinton Stimpson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5b1b47d703f88d8a65aab4a1a196b727b9eb0f67 (commit)
       via  bd66cc9d39a1ce1f81e44fca95142ee3842b6501 (commit)
      from  1c597e968dfda90da7460cae33b9e5fbdb8a5e72 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b1b47d703f88d8a65aab4a1a196b727b9eb0f67
commit 5b1b47d703f88d8a65aab4a1a196b727b9eb0f67
Merge: 1c597e9 bd66cc9
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Nov 23 18:02:44 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 23 18:02:44 2010 -0500

    Merge topic 'qt4-deps-tiff-jpeg-mng' into next
    
    bd66cc9 Fix build issues cross compiling with static Qt.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd66cc9d39a1ce1f81e44fca95142ee3842b6501
commit bd66cc9d39a1ce1f81e44fca95142ee3842b6501
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Nov 23 16:01:43 2010 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Tue Nov 23 16:01:43 2010 -0700

    Fix build issues cross compiling with static Qt.
    
    Also fix case where system jpeg, png, tiff libs are used.

diff --git a/Modules/Qt4ConfigDependentSettings.cmake b/Modules/Qt4ConfigDependentSettings.cmake
index bfb50de..10af3bc 100644
--- a/Modules/Qt4ConfigDependentSettings.cmake
+++ b/Modules/Qt4ConfigDependentSettings.cmake
@@ -35,10 +35,10 @@ SET(QT_QTHELP_LIB_DEPENDENCIES ${QT_QTCLUCENE_LIBRARY})
 
 
 IF(Q_WS_WIN)
-  # On Windows, qconfig.pri has "static" for static library builds
-  IF(QT_CONFIG MATCHES "static")
+  # On Windows, qconfig.pri has "shared" for shared library builds
+  IF(NOT QT_CONFIG MATCHES "shared")
     SET(QT_IS_STATIC 1)
-  ENDIF(QT_CONFIG MATCHES "static")
+  ENDIF(NOT QT_CONFIG MATCHES "shared")
 ELSE(Q_WS_WIN)
   # On other platforms, check file extension to know if its static
   IF(QT_QTCORE_LIBRARY_RELEASE)
@@ -75,6 +75,23 @@ IF(QT_QCONFIG MATCHES "system-png")
   SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${PNG_LIBRARY})
 ENDIF(QT_QCONFIG MATCHES "system-png")
 
+## system jpeg
+IF(QT_QCONFIG MATCHES "system-jpeg")
+  find_package(JPEG)
+  SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${JPEG_LIBRARIES})
+ENDIF(QT_QCONFIG MATCHES "system-jpeg")
+
+## system tiff
+IF(QT_QCONFIG MATCHES "system-tiff")
+  find_package(TIFF)
+  SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${TIFF_LIBRARIES})
+ENDIF(QT_QCONFIG MATCHES "system-tiff")
+
+## system mng
+IF(QT_QCONFIG MATCHES "system-mng")
+  find_library(MNG_LIBRARY NAMES mng)
+  SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${MNG_LIBRARY})
+ENDIF(QT_QCONFIG MATCHES "system-mng")
 
 # for X11, get X11 library directory
 IF(Q_WS_X11)

-----------------------------------------------------------------------

Summary of changes:
 Modules/Qt4ConfigDependentSettings.cmake |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake