[Cmake-commits] [cmake-commits] alex committed Qt4ConfigDependentSettings.cmake 1.1 1.2

[cmake-commits at cmake.org]

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

Modified Files:
	Qt4ConfigDependentSettings.cmake 
Log Message:
only add -DQT_DLL on Windows, ok by Clinton

Alex


Index: Qt4ConfigDependentSettings.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Qt4ConfigDependentSettings.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** Qt4ConfigDependentSettings.cmake	15 Nov 2009 18:02:19 -0000	1.1
--- Qt4ConfigDependentSettings.cmake	17 Nov 2009 20:20:58 -0000	1.2
***************
*** 37,45 ****
  
  # 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_DLL might not get defined properly on other platforms.
    SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_DLL)
! ENDIF(NOT QT_CONFIG MATCHES "static")
  
  
--- 37,45 ----
  
  # 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  AND  NOT QT_CONFIG MATCHES "static")