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

Merge topic 'qt4-include-as-system' 

691ac05 Qt4: Add SYSTEM option to include_directories.
This commit is contained in:
David Cole 2012-12-05 10:30:40 -05:00 committed by CMake Topic Stage
parent ba6e8264fe 691ac05d40
commit 7b910c0066
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindQt4.cmake
View File

@ -65,6 +65,10 @@
# is much more flexible, but requires that FindQt4.cmake is executed before # is much more flexible, but requires that FindQt4.cmake is executed before
# such an exported dependency file is processed. # such an exported dependency file is processed.
# #
# QT_INCLUDE_DIRS_NO_SYSTEM
# If this variable is set to TRUE, the Qt include directories
# in the QT_USE_FILE will NOT have the SYSTEM keyword set.
#
# There are also some files that need processing by some Qt tools such as moc # There are also some files that need processing by some Qt tools such as moc
# and uic. Listed below are macros that may be used to process those files. # and uic. Listed below are macros that may be used to process those files.
# #

12
Modules/UseQt4.cmake
View File

@ -25,7 +25,11 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_DEBUG) set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_DEBUG)
endif() endif()
include_directories(${QT_INCLUDE_DIR}) if(QT_INCLUDE_DIRS_NO_SYSTEM)
include_directories(${QT_INCLUDE_DIR})
else(QT_INCLUDE_DIRS_NO_SYSTEM)
include_directories(SYSTEM ${QT_INCLUDE_DIR})
endif(QT_INCLUDE_DIRS_NO_SYSTEM)
set(QT_LIBRARIES "") set(QT_LIBRARIES "")
set(QT_LIBRARIES_PLUGINS "") set(QT_LIBRARIES_PLUGINS "")
@ -89,7 +93,11 @@ foreach(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN
if(QT_USE_${module}) if(QT_USE_${module})
string(REPLACE "QT" "" qt_module_def "${module}") string(REPLACE "QT" "" qt_module_def "${module}")
add_definitions(-DQT_${qt_module_def}_LIB) add_definitions(-DQT_${qt_module_def}_LIB)
include_directories(${QT_${module}_INCLUDE_DIR}) if(QT_INCLUDE_DIRS_NO_SYSTEM)
include_directories(${QT_${module}_INCLUDE_DIR})
else(QT_INCLUDE_DIRS_NO_SYSTEM)
include_directories(SYSTEM ${QT_${module}_INCLUDE_DIR})
endif(QT_INCLUDE_DIRS_NO_SYSTEM)
endif() endif()
set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIBRARY}) set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIBRARY})
set(QT_LIBRARIES_PLUGINS ${QT_LIBRARIES_PLUGINS} ${QT_${module}_PLUGINS}) set(QT_LIBRARIES_PLUGINS ${QT_LIBRARIES_PLUGINS} ${QT_${module}_PLUGINS})