diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-09-13 02:39:12 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-09-13 02:39:12 (GMT) |
| commit | 9405e302189bf78859625d8aa4af8c01133ed28d (patch) | |
| tree | cadc4701b644d3e7a7949aa4afc0b64a81bed163 /Modules | |
| parent | 9a326a48e7b1624a9f15d3b9617bf23b2bbea034 (diff) | |
| download | CMake-9405e302189bf78859625d8aa4af8c01133ed28d.zip CMake-9405e302189bf78859625d8aa4af8c01133ed28d.tar.gz CMake-9405e302189bf78859625d8aa4af8c01133ed28d.tar.bz2 | |
ENH: more findqt fixes
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt.cmake | 10 | ||||
| -rw-r--r-- | Modules/FindQt4.cmake | 2 |
2 files changed, 6 insertions, 6 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) diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index c44fe2e..32281ae 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -339,7 +339,7 @@ IF(QT4_QMAKE_FOUND) CACHE STRING "The QtNetwork library.") SET(QT_QTOPENGL_LIBRARY "-framework QtOpenGL" CACHE STRING "The QtOpenGL library.") - SET(QT_QTOPENGL_LIBRARY_GUI "-framework QtOpenGL" + SET(QT_QTOPENGL_LIBRARY_DEBUG "-framework QtOpenGL" CACHE STRING "The QtOpenGL library.") SET(QT_QTSQL_LIBRARY "-framework QtSql" CACHE STRING "The QtSql library.") |