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

ENH: make sure the correct qmake is used

Browse Source
This commit is contained in:
Bill Hoffman 2005-09-12 09:00:55 -04:00
parent b6880f295d
commit f52977a9f7
2 changed files with 542 additions and 533 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindQt.cmake
View File

@ -41,7 +41,7 @@ ENDIF(GLOB_TEMP_VAR)
SET(GLOB_TEMP_VAR) SET(GLOB_TEMP_VAR)
# now find qmake # now find qmake
FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin") FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin")
IF(QT_QMAKE_EXECUTABLE) IF(QT_QMAKE_EXECUTABLE)
EXEC_PROGRAM(${QMAKE_PATH} ARGS "-query QT_VERSION" EXEC_PROGRAM(${QMAKE_PATH} ARGS "-query QT_VERSION"
OUTPUT_VARIABLE QTVERSION) OUTPUT_VARIABLE QTVERSION)
@ -131,4 +131,4 @@ ELSE(NOT QT3_INSTALLED AND NOT QT4_INSTALLED)
ENDIF(QT_REQUIRED) ENDIF(QT_REQUIRED)
ENDIF(NOT QT_FOUND AND DESIRED_QT_VERSION) ENDIF(NOT QT_FOUND AND DESIRED_QT_VERSION)
ENDIF(NOT QT3_INSTALLED AND NOT QT4_INSTALLED) ENDIF(NOT QT3_INSTALLED AND NOT QT4_INSTALLED)
MARK_AS_ADVANCED(QT3_QGLOBAL_H_FILE QT4_QGLOBAL_H_FILE QT_QMAKE_EXECUTABLE) MARK_AS_ADVANCED(QT3_QGLOBAL_H_FILE QT4_QGLOBAL_H_FILE QT_QMAKE_EXECUTABLE_FINDQT)

15
Modules/FindQt4.cmake
View File

@ -117,10 +117,17 @@ ENDIF(WIN32)
# check for qmake # check for qmake
FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS
$ENV{QTDIR}/bin
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
$ENV{QTDIR}/bin
) )
IF(QT_QMAKE_EXECUTABLE)
EXEC_PROGRAM(${QMAKE_PATH} ARGS "-query QT_VERSION"
OUTPUT_VARIABLE QTVERSION)
IF(QTVERSION MATCHES "4.*")
SET(QT4_QMAKE_FOUND TRUE)
ENDIF(QTVERSION MATCHES "4.*")
ENDIF(QT_QMAKE_EXECUTABLE)
IF(QT4_QMAKE_FOUND)
# Set QT_LIBRARY_DIR # Set QT_LIBRARY_DIR
IF(NOT QT_LIBRARY_DIR) IF(NOT QT_LIBRARY_DIR)
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE} EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
@ -690,4 +697,6 @@ SET (QT_UIC_EXE ${QT_UIC_EXECUTABLE} )
SET( QT_QT_LIBRARY "") SET( QT_QT_LIBRARY "")
SET( QT_QTMAIN_LIBRARY "") SET( QT_QTMAIN_LIBRARY "")
ELSE(QT4_QMAKE_FOUND)
MESSAGE("QT_QMAKE_EXECUTABLE set to qmake version: ${QTVERSION} ${QT_QMAKE_EXECUTABLE}, please set to path to qmake from qt4.")
ENDIF(QT4_QMAKE_FOUND)