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

document how the minimum version can be specified

Browse Source 
Alex
This commit is contained in:
Alexander Neundorf 2009-10-01 16:48:19 -04:00
parent 44bcba7461
commit 61a1ec5f20
1 changed files with 55 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Modules/FindQt4.cmake
View File

@ -14,6 +14,14 @@
# add_executable(myexe main.cpp) # add_executable(myexe main.cpp)
# target_link_libraries(myexe ${QT_LIBRARIES}) # target_link_libraries(myexe ${QT_LIBRARIES})
# #
# The minimum required version can be specified using the standard find_package()-syntax
# (see example above).
# For compatibility with older versions of FindQt4.cmake it is also possible to
# set the variable QT_MIN_VERSION to the minimum required version of Qt4 before the
# find_package(Qt4) command.
# If both are used, the version used in the find_package() command overrides the
# one from QT_MIN_VERSION.
#
# When using the components argument, QT_USE_QT* variables are automatically set # When using the components argument, QT_USE_QT* variables are automatically set
# for the QT_USE_FILE to pick up. If one wishes to manually set them, the # for the QT_USE_FILE to pick up. If one wishes to manually set them, the
# available ones to set include: # available ones to set include:
@ -412,8 +420,6 @@ IF (QT_QMAKE_EXECUTABLE)
# Suppport finding at least a particular version, for instance FIND_PACKAGE( Qt4 4.4.3 ) # Suppport finding at least a particular version, for instance FIND_PACKAGE( Qt4 4.4.3 )
# This implementation is a hack to avoid duplicating code and make sure we stay # This implementation is a hack to avoid duplicating code and make sure we stay
# source-compatible with CMake 2.6.x # source-compatible with CMake 2.6.x
# For CMake 2.8, we should not set QT_MIN_VERSION but only use Qt4_FIND_VERSION_MAJOR,
# Qt4_FIND_VERSION_MINOR, etc
IF( Qt4_FIND_VERSION ) IF( Qt4_FIND_VERSION )
SET( QT_MIN_VERSION ${Qt4_FIND_VERSION} ) SET( QT_MIN_VERSION ${Qt4_FIND_VERSION} )
SET( req_qt_major_vers ${Qt4_FIND_VERSION_MAJOR} ) SET( req_qt_major_vers ${Qt4_FIND_VERSION_MAJOR} )
@ -435,7 +441,6 @@ IF (QT_QMAKE_EXECUTABLE)
MATH(EXPR found_vers "${QT_VERSION_MAJOR}*10000 + ${QT_VERSION_MINOR}*100 + ${QT_VERSION_PATCH}") MATH(EXPR found_vers "${QT_VERSION_MAJOR}*10000 + ${QT_VERSION_MINOR}*100 + ${QT_VERSION_PATCH}")
# Support finding *exactly* a particular version, for instance FIND_PACKAGE( Qt4 4.4.3 EXACT ) # Support finding *exactly* a particular version, for instance FIND_PACKAGE( Qt4 4.4.3 EXACT )
# The 'else' branch should be removed for CMake 2.8
IF( Qt4_FIND_VERSION_EXACT ) IF( Qt4_FIND_VERSION_EXACT )
IF(found_vers EQUAL req_vers) IF(found_vers EQUAL req_vers)
SET( QT4_QMAKE_FOUND TRUE ) SET( QT4_QMAKE_FOUND TRUE )
@ -875,8 +880,6 @@ IF (QT4_QMAKE_FOUND)
IF(Q_WS_X11) IF(Q_WS_X11)
_QT4_ADJUST_LIB_VARS(QTMOTIF) _QT4_ADJUST_LIB_VARS(QTMOTIF)
ENDIF(Q_WS_X11) ENDIF(Q_WS_X11)
# platform dependent libraries
IF(WIN32) IF(WIN32)
_QT4_ADJUST_LIB_VARS(QTMAIN) _QT4_ADJUST_LIB_VARS(QTMAIN)
_QT4_ADJUST_LIB_VARS(QAXSERVER) _QT4_ADJUST_LIB_VARS(QAXSERVER)