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

ENH: -apply the patches by Clinton Stimpson and Kenneth Moreland which fix 

some QtMain issues on Windows
ENH: -sync with KDE svn FindQt4, which features a lot of enhancements

Alex
This commit is contained in:
Alexander Neundorf 2006-04-27 15:07:23 -04:00
parent f0e2563cc6
commit f59ad1aa6e
2 changed files with 609 additions and 442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1038
Modules/FindQt4.cmake
View File

File diff suppressed because it is too large Load Diff

13
Modules/UseQt4.cmake
View File

@ -103,6 +103,19 @@ IF (QT_USE_QTDESIGNER)
ENDIF (QT_QTDESIGNER_FOUND) ENDIF (QT_QTDESIGNER_FOUND)
ENDIF (QT_USE_QTDESIGNER) ENDIF (QT_USE_QTDESIGNER)
IF (QT_USE_QTMAIN)
IF (WIN32)
IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
SET(QT_LIBRARIES ${QT_LIBRARIES}
optimized "${QT_QTMAIN_LIBRARY}"
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)
ENDIF (WIN32)
ENDIF (QT_USE_QTMAIN)
IF (QT_USE_QTMOTIF) IF (QT_USE_QTMOTIF)
IF (QT_QTMOTIF_FOUND) IF (QT_QTMOTIF_FOUND)
INCLUDE_DIRECTORIES(${QT_QTMOTIF_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${QT_QTMOTIF_INCLUDE_DIR})