diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2009-11-15 18:12:27 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2009-11-15 18:12:27 +0000 |
| commit | eb0612652833020ea9cf43531ee744ae985537fa (patch) | |
| tree | 179615894b52648e7e07eabc045bfe16671ff353 | |
| parent | 14509a5fab6ac84d825b8fc834633d37c524232f (diff) | |
| download | extra-cmake-modules-eb0612652833020ea9cf43531ee744ae985537fa.tar.gz extra-cmake-modules-eb0612652833020ea9cf43531ee744ae985537fa.tar.bz2 | |
-sync with cmake: move -DQT_DLL into Qt4ConfigDependentSettings.cmake
Alex
svn path=/trunk/KDE/kdelibs/; revision=1049724
| -rw-r--r-- | modules/FindQt4.cmake | 9 | ||||
| -rw-r--r-- | modules/Qt4ConfigDependentSettings.cmake | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 1f1a429c..0999931f 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -378,10 +378,6 @@ SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake) SET( QT_DEFINITIONS "") -IF (WIN32) - SET(QT_DEFINITIONS -DQT_DLL) -ENDIF(WIN32) - SET(QT4_INSTALLED_VERSION_TOO_OLD FALSE) # macro for asking qmake to process pro files @@ -786,11 +782,6 @@ IF (QT4_QMAKE_FOUND) SET(QT_EDITION_DESKTOPLIGHT 1) ENDIF("${QT_EDITION}" MATCHES "DesktopLight") -# Remove this when nobody comes and complains that it doesn't build for him on mac until 31.12.2009: -# IF (QT_USE_FRAMEWORKS) -# SET(QT_DEFINITIONS ${QT_DEFINITIONS} -F${QT_LIBRARY_DIR} -L${QT_LIBRARY_DIR} ) -# ENDIF (QT_USE_FRAMEWORKS) - ######################################## # # Setting the LIBRARY-Variables diff --git a/modules/Qt4ConfigDependentSettings.cmake b/modules/Qt4ConfigDependentSettings.cmake index 4aac513a..77fa4572 100644 --- a/modules/Qt4ConfigDependentSettings.cmake +++ b/modules/Qt4ConfigDependentSettings.cmake @@ -30,3 +30,6 @@ IF(UNIX) SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) ENDIF(UNIX) +IF (WIN32) + SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_DLL) +ENDIF(WIN32) |