diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-08-01 15:26:32 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-08-01 15:26:32 (GMT) |
| commit | 7776d18896bda01c743317dd45fd5c816e8f408a (patch) | |
| tree | 8f391637b4f1e33d7783ea43d192f34bf8f68e0c /Modules | |
| parent | 4cafb72616f9c9adf4f17371ef2e891ed0766b41 (diff) | |
| download | CMake-7776d18896bda01c743317dd45fd5c816e8f408a.zip CMake-7776d18896bda01c743317dd45fd5c816e8f408a.tar.gz CMake-7776d18896bda01c743317dd45fd5c816e8f408a.tar.bz2 | |
ENH: fix qtmain for release
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 5 | ||||
| -rw-r--r-- | Modules/UseQt4.cmake | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 3be78b8..66f7882 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -541,11 +541,6 @@ IF (QT4_QMAKE_FOUND) NO_DEFAULT_PATH) FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmaind PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) - IF(QT_QTMAIN_LIBRARY_RELEASE) - SET(QT_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARY_RELEASE}) - ELSE(QT_QTMAIN_LIBRARY_RELEASE) - SET(QT_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARY_DEBUG}) - ENDIF(QT_QTMAIN_LIBRARY_RELEASE) ENDIF(WIN32) ############################################ diff --git a/Modules/UseQt4.cmake b/Modules/UseQt4.cmake index 43f48ca..580678d 100644 --- a/Modules/UseQt4.cmake +++ b/Modules/UseQt4.cmake @@ -107,9 +107,9 @@ IF (QT_USE_QTMAIN) IF (WIN32) IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) SET(QT_LIBRARIES ${QT_LIBRARIES} - optimized "${QT_QTMAIN_LIBRARY_RELEASE}" - debug "${QT_QTMAIN_LIBRARY_DEBUG}" - ) + optimized "${QT_QTMAIN_LIBRARY_RELEASE}" + debug "${QT_QTMAIN_LIBRARY_DEBUG}" + ) ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_QTMAIN_LIBRARY}") ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) |