reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-23 11:39:48 +00:00
Code Issues Actions Packages Projects 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)
# 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)
EXEC_PROGRAM(${QMAKE_PATH} ARGS "-query QT_VERSION"
OUTPUT_VARIABLE QTVERSION)
@ -131,4 +131,4 @@ ELSE(NOT QT3_INSTALLED AND NOT QT4_INSTALLED)
ENDIF(QT_REQUIRED)
ENDIF(NOT QT_FOUND AND DESIRED_QT_VERSION)
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)

1047
Modules/FindQt4.cmake
View File

File diff suppressed because it is too large Load Diff