[cmake-commits] clinton committed FindQt4.cmake 1.82 1.83

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:
ENH: should define QT_DLL instead of QT_SHARED


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- FindQt4.cmake	18 Dec 2007 18:05:43 -0000	1.82
+++ FindQt4.cmake	18 Dec 2007 19:50:18 -0000	1.83
@@ -1143,12 +1143,11 @@
   SET(QT_GUI_LIB_DEPENDENCIES "")
   SET(QT_CORE_LIB_DEPENDENCIES "")
   
-  # shared build needs -DQT_SHARED
+  # build using shared Qt needs -DQT_DLL
   IF(NOT QT_CONFIG MATCHES "static")
     # warning currently only qconfig.pri on Windows potentially contains "static"
-    # so QT_SHARED might not get defined properly on Mac/X11 (which seems harmless right now)
-    # Trolltech said they'd consider exporting it for all platforms in future releases.
-    SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_SHARED)
+    # so QT_DLL might not get defined properly on other platforms.
+    SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_DLL)
   ENDIF(NOT QT_CONFIG MATCHES "static")
   
   ## system png