|
|
@@ -110,7 +110,6 @@ IF(NOT QT_QT_INCLUDE_DIR)
|
|
|
ENDIF(NOT QT_QT_INCLUDE_DIR)
|
|
|
|
|
|
# Set QT_INCLUDE_DIR by removine "/Qt" in the string ${QT_QT_INCLUDE_DIR}
|
|
|
-MESSAGE(STATUS "Looking for QT_INCLUDE_DIR")
|
|
|
IF(NOT QT_INCLUDE_DIR)
|
|
|
IF( QT_QT_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
|
|
|
STRING( REGEX REPLACE "/Qt$" "" qt4_include_dir ${QT_QT_INCLUDE_DIR})
|
|
|
@@ -235,6 +234,7 @@ ENDIF(NOT QT_QTXML_INCLUDE_DIR)
|
|
|
|
|
|
# Make variables changeble to the advanced user
|
|
|
MARK_AS_ADVANCED(
|
|
|
+ QT_LIBRARY_DIR
|
|
|
QT_INCLUDE_DIR
|
|
|
QT_QT_INCLUDE_DIR
|
|
|
QT_QT3SUPPORT_INCLUDE_DIR
|
|
|
@@ -653,7 +653,6 @@ IF(NOT QT_MOC_EXECUTABLE)
|
|
|
ARGS "-query QT_INSTALL_BINS"
|
|
|
OUTPUT_VARIABLE qt_bins )
|
|
|
ENDIF(QT_QMAKE_EXECUTABLE)
|
|
|
- MESSAGE(STATUS ${qt_bins})
|
|
|
FIND_PROGRAM(QT_MOC_EXECUTABLE
|
|
|
NAMES moc
|
|
|
PATHS
|
Bill Hoffman