diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-09-12 09:00:55 -0400 |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-09-12 09:00:55 -0400 |
| commit | f52977a9f79bcc4e9a7f6edd099a9e06c71b8b25 (patch) | |
| tree | fc066c19fd0d9de72ec7c94ee4a180112964fd8f /Modules/FindQt.cmake | |
| parent | b6880f295d49f31156339f26bd17b25a3d7cbca3 (diff) | |
| download | cmake-f52977a9f79bcc4e9a7f6edd099a9e06c71b8b25.tar.gz | |
ENH: make sure the correct qmake is used
Diffstat (limited to 'Modules/FindQt.cmake')
| -rw-r--r-- | Modules/FindQt.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake index 407444388e..0e3e8746d2 100644 --- a/Modules/FindQt.cmake +++ b/Modules/FindQt.cmake @@ -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) |