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

Merge topic 'OpenBSD-patches' 

f80ccac OpenBSD: Add paths for Qt3/Qt4
This commit is contained in:
David Cole 2012-12-11 13:43:36 -05:00 committed by CMake Topic Stage
parent ab2b1f44f8 f80ccac158
commit d73c4057ed
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/FindQt.cmake
View File

@ -43,6 +43,12 @@ if(GLOB_TEMP_VAR)
endif() endif()
set(GLOB_TEMP_VAR) set(GLOB_TEMP_VAR)
file(GLOB GLOB_TEMP_VAR /usr/local/lib/qt3/bin/qmake)
if(GLOB_TEMP_VAR)
set(QT3_INSTALLED TRUE)
endif()
set(GLOB_TEMP_VAR)
# look for qt4 installations # look for qt4 installations
file(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-4*/bin/qmake) file(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-4*/bin/qmake)
if(GLOB_TEMP_VAR) if(GLOB_TEMP_VAR)
@ -56,6 +62,12 @@ if(GLOB_TEMP_VAR)
endif() endif()
set(GLOB_TEMP_VAR) set(GLOB_TEMP_VAR)
file(GLOB GLOB_TEMP_VAR /usr/local/lib/qt4/bin/qmake)
if(GLOB_TEMP_VAR)
set(QT4_INSTALLED TRUE)
endif()
set(GLOB_TEMP_VAR)
if (Qt_FIND_VERSION) if (Qt_FIND_VERSION)
set(DESIRED_QT_VERSION "${Qt_FIND_VERSION}") set(DESIRED_QT_VERSION "${Qt_FIND_VERSION}")
endif () endif ()
@ -91,6 +103,7 @@ find_file( QT4_QGLOBAL_H_FILE qglobal.h
/usr/lib/qt/include/Qt /usr/lib/qt/include/Qt
/usr/include/Qt /usr/include/Qt
/usr/share/qt4/include/Qt /usr/share/qt4/include/Qt
/usr/local/include/X11/qt4/Qt
C:/Progra~1/qt/include/Qt ) C:/Progra~1/qt/include/Qt )
if(QT4_QGLOBAL_H_FILE) if(QT4_QGLOBAL_H_FILE)
@ -110,6 +123,7 @@ find_file( QT3_QGLOBAL_H_FILE qglobal.h
/usr/lib/qt/include /usr/lib/qt/include
/usr/include /usr/include
/usr/share/qt3/include /usr/share/qt3/include
/usr/local/include/X11/qt3
C:/Progra~1/qt/include C:/Progra~1/qt/include
/usr/include/qt3 ) /usr/include/qt3 )

6
Modules/FindQt3.cmake
View File

@ -64,6 +64,7 @@ find_path(QT_INCLUDE_DIR qt.h
/usr/share/qt3/include /usr/share/qt3/include
C:/Progra~1/qt/include C:/Progra~1/qt/include
/usr/include/qt3 /usr/include/qt3
/usr/local/include/X11/qt3
) )
# if qglobal.h is not in the qt_include_dir then set # if qglobal.h is not in the qt_include_dir then set
@ -146,7 +147,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
# Qt 3 should prefer QTDIR over the PATH # Qt 3 should prefer QTDIR over the PATH
find_program(QT_MOC_EXECUTABLE find_program(QT_MOC_EXECUTABLE
NAMES moc-qt3 moc NAMES moc-qt3 moc moc3 moc3-mt
HINTS HINTS
ENV QTDIR ENV QTDIR
PATHS PATHS
@ -154,6 +155,7 @@ find_program(QT_MOC_EXECUTABLE
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
${GLOB_PATHS_BIN} ${GLOB_PATHS_BIN}
/usr/local/lib/qt3
/usr/local/qt /usr/local/qt
/usr/lib/qt /usr/lib/qt
/usr/lib/qt3 /usr/lib/qt3
@ -170,7 +172,7 @@ endif()
# Qt 3 should prefer QTDIR over the PATH # Qt 3 should prefer QTDIR over the PATH
find_program(QT_UIC_EXECUTABLE find_program(QT_UIC_EXECUTABLE
NAMES uic-qt3 uic NAMES uic-qt3 uic uic3 uic3-mt
HINTS HINTS
ENV QTDIR ENV QTDIR
PATHS PATHS

12
Modules/FindQt4.cmake
View File

@ -986,13 +986,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
endif() endif()
find_program(QT_MOC_EXECUTABLE find_program(QT_MOC_EXECUTABLE
NAMES moc-qt4 moc NAMES moc-qt4 moc moc4
PATHS ${QT_BINARY_DIR} PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
) )
find_program(QT_UIC_EXECUTABLE find_program(QT_UIC_EXECUTABLE
NAMES uic-qt4 uic NAMES uic-qt4 uic uic4
PATHS ${QT_BINARY_DIR} PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
) )
@ -1022,13 +1022,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
) )
find_program(QT_LUPDATE_EXECUTABLE find_program(QT_LUPDATE_EXECUTABLE
NAMES lupdate-qt4 lupdate NAMES lupdate-qt4 lupdate lupdate4
PATHS ${QT_BINARY_DIR} PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
) )
find_program(QT_LRELEASE_EXECUTABLE find_program(QT_LRELEASE_EXECUTABLE
NAMES lrelease-qt4 lrelease NAMES lrelease-qt4 lrelease lrelease4
PATHS ${QT_BINARY_DIR} PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
) )
@ -1040,13 +1040,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
) )
find_program(QT_DESIGNER_EXECUTABLE find_program(QT_DESIGNER_EXECUTABLE
NAMES designer-qt4 designer NAMES designer-qt4 designer designer4
PATHS ${QT_BINARY_DIR} PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
) )
find_program(QT_LINGUIST_EXECUTABLE find_program(QT_LINGUIST_EXECUTABLE
NAMES linguist-qt4 linguist NAMES linguist-qt4 linguist linguist4
PATHS ${QT_BINARY_DIR} PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
) )