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

ENH: some clean up from Clinton

Browse Source
This commit is contained in:
Bill Hoffman 2005-08-10 12:50:56 -04:00
parent 97e43d6481
commit b058a5e1aa
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/FindQt4.cmake
View File

@ -110,7 +110,6 @@ IF(NOT QT_QT_INCLUDE_DIR)
ENDIF(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} # 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(NOT QT_INCLUDE_DIR)
IF( QT_QT_INCLUDE_DIR AND 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}) 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 # Make variables changeble to the advanced user
MARK_AS_ADVANCED( MARK_AS_ADVANCED(
QT_LIBRARY_DIR
QT_INCLUDE_DIR QT_INCLUDE_DIR
QT_QT_INCLUDE_DIR QT_QT_INCLUDE_DIR
QT_QT3SUPPORT_INCLUDE_DIR QT_QT3SUPPORT_INCLUDE_DIR
@ -653,7 +653,6 @@ IF(NOT QT_MOC_EXECUTABLE)
ARGS "-query QT_INSTALL_BINS" ARGS "-query QT_INSTALL_BINS"
OUTPUT_VARIABLE qt_bins ) OUTPUT_VARIABLE qt_bins )
ENDIF(QT_QMAKE_EXECUTABLE) ENDIF(QT_QMAKE_EXECUTABLE)
MESSAGE(STATUS ${qt_bins})
FIND_PROGRAM(QT_MOC_EXECUTABLE FIND_PROGRAM(QT_MOC_EXECUTABLE
NAMES moc NAMES moc
PATHS PATHS