kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: more findqt fixes

This commit is contained in:
Bill Hoffman 2005-09-12 22:39:12 -04:00
parent 9a326a48e7
commit 9405e30218
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/FindQt.cmake
View File

@ -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)

2
Modules/FindQt4.cmake
View File

@ -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.")