kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fix qtmain for release

This commit is contained in:
Bill Hoffman 2006-08-01 10:51:17 -04:00
parent 1973efbab2
commit 4cafb72616
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/FindQt4.cmake
View File

@ -541,6 +541,11 @@ IF (QT4_QMAKE_FOUND)
NO_DEFAULT_PATH) NO_DEFAULT_PATH)
FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmaind PATHS ${QT_LIBRARY_DIR} FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmaind PATHS ${QT_LIBRARY_DIR}
NO_DEFAULT_PATH) 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) ENDIF(WIN32)
############################################ ############################################

2
Modules/UseQt4.cmake
View File

@ -107,7 +107,7 @@ IF (QT_USE_QTMAIN)
IF (WIN32) IF (WIN32)
IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
SET(QT_LIBRARIES ${QT_LIBRARIES} SET(QT_LIBRARIES ${QT_LIBRARIES}
optimized "${QT_QTMAIN_LIBRARY}" optimized "${QT_QTMAIN_LIBRARY_RELEASE}"
debug "${QT_QTMAIN_LIBRARY_DEBUG}" debug "${QT_QTMAIN_LIBRARY_DEBUG}"
) )
ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)