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

some syncing with FindQt4.cmake from KDE, no functional changes 

-the mark_as_advanced() calls for the variables coming from qmake are now in
the corresponding section, and not in the section where the include dirs are
foudn

Alex
This commit is contained in:
Alexander Neundorf 2009-11-08 13:01:46 -05:00
parent f5fe20dc12
commit e325b1a38a
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Modules/FindQt4.cmake
View File

@ -564,6 +564,11 @@ IF (QT4_QMAKE_FOUND)
SET(QT_TRANSLATIONS_DIR ${qt_translations_dir} CACHE PATH "The location of the Qt translations" FORCE) SET(QT_TRANSLATIONS_DIR ${qt_translations_dir} CACHE PATH "The location of the Qt translations" FORCE)
ENDIF (QT_LIBRARY_DIR AND NOT QT_TRANSLATIONS_DIR OR QT_QMAKE_CHANGED) ENDIF (QT_LIBRARY_DIR AND NOT QT_TRANSLATIONS_DIR OR QT_QMAKE_CHANGED)
# Make variables changeble to the advanced user
MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_DOC_DIR QT_MKSPECS_DIR
QT_PLUGINS_DIR QT_TRANSLATIONS_DIR)
######################################## ########################################
# #
# Setting the INCLUDE-Variables # Setting the INCLUDE-Variables
@ -653,6 +658,9 @@ IF (QT4_QMAKE_FOUND)
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
# Make variables changeble to the advanced user
MARK_AS_ADVANCED( QT_INCLUDE_DIR )
# Set QT_INCLUDE_DIR by removine "/QtCore" in the string ${QT_QTCORE_INCLUDE_DIR} # Set QT_INCLUDE_DIR by removine "/QtCore" in the string ${QT_QTCORE_INCLUDE_DIR}
IF( QT_QTCORE_INCLUDE_DIR ) IF( QT_QTCORE_INCLUDE_DIR )
IF (QT_USE_FRAMEWORKS) IF (QT_USE_FRAMEWORKS)
@ -669,10 +677,6 @@ IF (QT4_QMAKE_FOUND)
ENDIF(Qt4_FIND_REQUIRED) ENDIF(Qt4_FIND_REQUIRED)
ENDIF( NOT QT_INCLUDE_DIR) ENDIF( NOT QT_INCLUDE_DIR)
# Make variables changeble to the advanced user
MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR
QT_PLUGINS_DIR QT_TRANSLATIONS_DIR)
# Set QT_INCLUDES # Set QT_INCLUDES
SET( QT_INCLUDES ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR} ) SET( QT_INCLUDES ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR} )
@ -735,8 +739,11 @@ IF (QT4_QMAKE_FOUND)
SET(QT_EDITION_DESKTOPLIGHT 1) SET(QT_EDITION_DESKTOPLIGHT 1)
ENDIF("${QT_EDITION}" MATCHES "DesktopLight") ENDIF("${QT_EDITION}" MATCHES "DesktopLight")
########################################
#
# Setting the LIBRARY-Variables
#
########################################
# find the libraries # find the libraries
FOREACH(QT_MODULE ${QT_MODULES}) FOREACH(QT_MODULE ${QT_MODULES})