[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.179 1.180

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv12372

Modified Files:
	FindQt4.cmake 
Log Message:
Don't search for QtMotif on all platforms - only on X11.


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.179
retrieving revision 1.180
diff -C 2 -d -r1.179 -r1.180
*** FindQt4.cmake	15 Nov 2009 18:02:18 -0000	1.179
--- FindQt4.cmake	17 Nov 2009 19:44:33 -0000	1.180
***************
*** 572,575 ****
--- 572,616 ----
  
  
+   #############################################
+   #
+   # Find out what window system we're using
+   #
+   #############################################
+   # Save required variable
+   SET(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES})
+   SET(CMAKE_REQUIRED_FLAGS_SAVE    ${CMAKE_REQUIRED_FLAGS})
+   # Add QT_INCLUDE_DIR to CMAKE_REQUIRED_INCLUDES
+   SET(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${QT_HEADERS_DIR}")
+   # On Mac OS X when Qt has framework support, also add the framework path
+   IF( QT_USE_FRAMEWORKS )
+     SET(CMAKE_REQUIRED_FLAGS "-F${QT_LIBRARY_DIR} ")
+   ENDIF( QT_USE_FRAMEWORKS )
+   # Check for Window system symbols (note: only one should end up being set)
+   CHECK_SYMBOL_EXISTS(Q_WS_X11 "QtCore/qglobal.h" Q_WS_X11)
+   CHECK_SYMBOL_EXISTS(Q_WS_WIN "QtCore/qglobal.h" Q_WS_WIN)
+   CHECK_SYMBOL_EXISTS(Q_WS_QWS "QtCore/qglobal.h" Q_WS_QWS)
+   CHECK_SYMBOL_EXISTS(Q_WS_MAC "QtCore/qglobal.h" Q_WS_MAC)
+   IF(Q_WS_MAC)
+     IF(QT_QMAKE_CHANGED)
+       UNSET(QT_MAC_USE_COCOA CACHE)
+     ENDIF(QT_QMAKE_CHANGED)
+     CHECK_SYMBOL_EXISTS(QT_MAC_USE_COCOA "QtCore/qconfig.h" QT_MAC_USE_COCOA)
+   ENDIF(Q_WS_MAC)
+ 
+   IF (QT_QTCOPY_REQUIRED)
+      CHECK_SYMBOL_EXISTS(QT_IS_QTCOPY "QtCore/qglobal.h" QT_KDE_QT_COPY)
+      IF (NOT QT_IS_QTCOPY)
+         MESSAGE(FATAL_ERROR "qt-copy is required, but hasn't been found")
+      ENDIF (NOT QT_IS_QTCOPY)
+   ENDIF (QT_QTCOPY_REQUIRED)
+ 
+   # Restore CMAKE_REQUIRED_INCLUDES and CMAKE_REQUIRED_FLAGS variables
+   SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE})
+   SET(CMAKE_REQUIRED_FLAGS    ${CMAKE_REQUIRED_FLAGS_SAVE})
+   #
+   #############################################
+ 
+ 
+ 
    ########################################
    #
***************
*** 579,584 ****
  
    SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools 
!                  QtHelp QtWebKit QtXmlPatterns phonon QtMotif QtNetwork 
                   QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus QtScriptTools)
  
    IF(QT_QMAKE_CHANGED)
--- 620,629 ----
  
    SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools 
!                  QtHelp QtWebKit QtXmlPatterns phonon QtNetwork 
                   QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus QtScriptTools)
+   
+   IF(Q_WS_X11)
+     SET(QT_MODULES ${QT_MODULES} QtMotif)
+   ENDIF(Q_WS_X11)
  
    IF(QT_QMAKE_CHANGED)
***************
*** 684,725 ****
  
  
-   #############################################
-   #
-   # Find out what window system we're using
-   #
-   #############################################
-   # Save required variable
-   SET(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES})
-   SET(CMAKE_REQUIRED_FLAGS_SAVE    ${CMAKE_REQUIRED_FLAGS})
-   # Add QT_INCLUDE_DIR to CMAKE_REQUIRED_INCLUDES
-   SET(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${QT_INCLUDE_DIR}")
-   # On Mac OS X when Qt has framework support, also add the framework path
-   IF( QT_USE_FRAMEWORKS )
-     SET(CMAKE_REQUIRED_FLAGS "-F${QT_LIBRARY_DIR} ")
-   ENDIF( QT_USE_FRAMEWORKS )
-   # Check for Window system symbols (note: only one should end up being set)
-   CHECK_SYMBOL_EXISTS(Q_WS_X11 "QtCore/qglobal.h" Q_WS_X11)
-   CHECK_SYMBOL_EXISTS(Q_WS_WIN "QtCore/qglobal.h" Q_WS_WIN)
-   CHECK_SYMBOL_EXISTS(Q_WS_QWS "QtCore/qglobal.h" Q_WS_QWS)
-   CHECK_SYMBOL_EXISTS(Q_WS_MAC "QtCore/qglobal.h" Q_WS_MAC)
-   IF(Q_WS_MAC)
-     IF(QT_QMAKE_CHANGED)
-       UNSET(QT_MAC_USE_COCOA CACHE)
-     ENDIF(QT_QMAKE_CHANGED)
-     CHECK_SYMBOL_EXISTS(QT_MAC_USE_COCOA "QtCore/qconfig.h" QT_MAC_USE_COCOA)
-   ENDIF(Q_WS_MAC)
- 
-   IF (QT_QTCOPY_REQUIRED)
-      CHECK_SYMBOL_EXISTS(QT_IS_QTCOPY "QtCore/qglobal.h" QT_KDE_QT_COPY)
-      IF (NOT QT_IS_QTCOPY)
-         MESSAGE(FATAL_ERROR "qt-copy is required, but hasn't been found")
-      ENDIF (NOT QT_IS_QTCOPY)
-   ENDIF (QT_QTCOPY_REQUIRED)
- 
-   # Restore CMAKE_REQUIRED_INCLUDES and CMAKE_REQUIRED_FLAGS variables
-   SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE})
-   SET(CMAKE_REQUIRED_FLAGS    ${CMAKE_REQUIRED_FLAGS_SAVE})
-   #
-   #############################################
  
  
--- 729,732 ----