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

ENH: fix qtmain for release

Browse Source
This commit is contained in:
Bill Hoffman 2006-08-01 11:26:32 -04:00
parent 4cafb72616
commit 7776d18896
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/FindQt4.cmake
View File

@ -541,11 +541,6 @@ 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)
############################################ ############################################

6
Modules/UseQt4.cmake
View File

@ -107,9 +107,9 @@ 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_RELEASE}" 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)
SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_QTMAIN_LIBRARY}") SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_QTMAIN_LIBRARY}")
ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)