diff options
| -rw-r--r-- | modules/FindQt4.cmake | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 4a7a1231..a9225f7b 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -586,10 +586,17 @@ IF (QT4_QMAKE_FOUND) # Set QT_QTDESIGNER_LIBRARY FIND_LIBRARY(QT_QTDESIGNER_LIBRARY NAMES QtDesigner QtDesigner4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) - # Set QT_QTDESIGNER_LIBRARY + # Set QT_QTDESIGNER_LIBRARY FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY NAMES QtDesignerComponents QtDesignerComponents4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) - + # Set QT_QTMAIN_LIBRARY + IF(WIN32) + FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain PATHS ${QT_LIBRARY_DIR} + NO_DEFAULT_PATH) + FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmaind PATHS ${QT_LIBRARY_DIR} + NO_DEFAULT_PATH) + ENDIF(WIN32) + ############################################ # # Check the existence of the libraries. @@ -631,7 +638,10 @@ IF (QT4_QMAKE_FOUND) ENDMACRO (_QT4_ADJUST_LIB_VARS) IF(WIN32) - _QT4_ADJUST_LIB_VARS(QTMAIN) + # there is no include for qtmain but adjust macro needs it set + SET(QT_QTMAIN_INCLUDE_DIR 1) + _QT4_ADJUST_LIB_VARS(QTMAIN) + SET(QT_QTMAIN_INCLUDE_DIR ) ENDIF(WIN32) |