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:
parent
f0e2563cc6
commit
f59ad1aa6e
File diff suppressed because it is too large
Load Diff
|
@ -103,6 +103,19 @@ IF (QT_USE_QTDESIGNER)
|
|||
ENDIF (QT_QTDESIGNER_FOUND)
|
||||
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_QTMOTIF_FOUND)
|
||||
INCLUDE_DIRECTORIES(${QT_QTMOTIF_INCLUDE_DIR})
|
||||
|
|
Loading…
Reference in New Issue