summaryrefslogtreecommitdiffstats
path: root/Modules/FindQt.cmake
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2005-09-12 13:00:55 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2005-09-12 13:00:55 (GMT)
commitf52977a9f79bcc4e9a7f6edd099a9e06c71b8b25 (patch)
treefc066c19fd0d9de72ec7c94ee4a180112964fd8f /Modules/FindQt.cmake
parentb6880f295d49f31156339f26bd17b25a3d7cbca3 (diff)
downloadCMake-f52977a9f79bcc4e9a7f6edd099a9e06c71b8b25.zip
CMake-f52977a9f79bcc4e9a7f6edd099a9e06c71b8b25.tar.gz
CMake-f52977a9f79bcc4e9a7f6edd099a9e06c71b8b25.tar.bz2
ENH: make sure the correct qmake is used
Diffstat (limited to 'Modules/FindQt.cmake')
-rw-r--r--Modules/FindQt.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake
index 4074443..0e3e874 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)