summaryrefslogtreecommitdiffstats
path: root/Modules/FindQt.cmake
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2005-09-13 02:39:12 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2005-09-13 02:39:12 (GMT)
commit9405e302189bf78859625d8aa4af8c01133ed28d (patch)
treecadc4701b644d3e7a7949aa4afc0b64a81bed163 /Modules/FindQt.cmake
parent9a326a48e7b1624a9f15d3b9617bf23b2bbea034 (diff)
downloadCMake-9405e302189bf78859625d8aa4af8c01133ed28d.zip
CMake-9405e302189bf78859625d8aa4af8c01133ed28d.tar.gz
CMake-9405e302189bf78859625d8aa4af8c01133ed28d.tar.bz2
ENH: more findqt fixes
Diffstat (limited to 'Modules/FindQt.cmake')
-rw-r--r--Modules/FindQt.cmake10
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake
index 41e2776..0cc53e0 100644
--- a/Modules/FindQt.cmake
+++ b/Modules/FindQt.cmake
@@ -42,8 +42,8 @@ SET(GLOB_TEMP_VAR)
# now find qmake
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"
+IF(QT_QMAKE_EXECUTABLE_FINDQT)
+ EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE_FINDQT} ARGS "-query QT_VERSION"
OUTPUT_VARIABLE QTVERSION)
IF(QTVERSION MATCHES "4.*")
SET(QT4_INSTALLED TRUE)
@@ -51,10 +51,10 @@ IF(QT_QMAKE_EXECUTABLE)
IF(QTVERSION MATCHES "Unknown")
SET(QT3_INSTALLED TRUE)
ENDIF(QTVERSION MATCHES "Unknown")
-ENDIF(QT_QMAKE_EXECUTABLE)
+ENDIF(QT_QMAKE_EXECUTABLE_FINDQT)
-IF(QT_QMAKE_EXECUTABLE)
- EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+IF(QT_QMAKE_EXECUTABLE_FINDQT)
+ EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE_FINDQT}
ARGS "-query QT_INSTALL_HEADERS"
OUTPUT_VARIABLE qt_headers )
ENDIF(QT_QMAKE_EXECUTABLE)