[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.167 1.168

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Oct 1 16:41:02 EDT 2009


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

Modified Files:
	FindQt4.cmake 
Log Message:
Add documentation for Cocoa flag and move Motif under X11 flag.


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.167
retrieving revision 1.168
diff -C 2 -d -r1.167 -r1.168
*** FindQt4.cmake	28 Sep 2009 15:45:40 -0000	1.167
--- FindQt4.cmake	1 Oct 2009 20:41:00 -0000	1.168
***************
*** 163,166 ****
--- 163,169 ----
  #  QT_QTSCRIPTTOOLS_FOUND   True if QtScriptTools was found.
  #
+ #  QT_MAC_USE_COCOA    For Mac OS X, its whether Cocoa or Carbon is used.
+ #                      In general, this should not be used, but its useful
+ #                      when having platform specific code.
  #
  #  QT_DEFINITIONS   Definitions to use when compiling code that uses Qt.
***************
*** 866,871 ****
    _QT4_ADJUST_LIB_VARS(PHONON)
    _QT4_ADJUST_LIB_VARS(QTCLUCENE)
-   _QT4_ADJUST_LIB_VARS(QTMOTIF)
    _QT4_ADJUST_LIB_VARS(QTSCRIPTTOOLS)
  
    # platform dependent libraries
--- 869,879 ----
    _QT4_ADJUST_LIB_VARS(PHONON)
    _QT4_ADJUST_LIB_VARS(QTCLUCENE)
    _QT4_ADJUST_LIB_VARS(QTSCRIPTTOOLS)
+  
+ 
+   # platform dependent libraries
+   IF(Q_WS_X11)
+     _QT4_ADJUST_LIB_VARS(QTMOTIF)
+   ENDIF(Q_WS_X11)
  
    # platform dependent libraries



More information about the Cmake-commits mailing list