diff options
| author | David Cole <david.cole@kitware.com> | 2012-12-05 15:30:40 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-12-05 15:30:40 (GMT) |
| commit | 7b910c00667ee8233000dd4ef682eab21acd86b5 (patch) | |
| tree | dd371659535ec4758d498a9c5929ce6bf3f0d8eb | |
| parent | ba6e8264fed13d53447593f96c01fc0d7fc5db4d (diff) | |
| parent | 691ac05d4049619407b6ff0b89207c5c77e21ae0 (diff) | |
| download | CMake-7b910c00667ee8233000dd4ef682eab21acd86b5.zip CMake-7b910c00667ee8233000dd4ef682eab21acd86b5.tar.gz CMake-7b910c00667ee8233000dd4ef682eab21acd86b5.tar.bz2 | |
Merge topic 'qt4-include-as-system'
691ac05 Qt4: Add SYSTEM option to include_directories.
| -rw-r--r-- | Modules/FindQt4.cmake | 4 | ||||
| -rw-r--r-- | Modules/UseQt4.cmake | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index b42247a..00e86e8 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -65,6 +65,10 @@ # is much more flexible, but requires that FindQt4.cmake is executed before # 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 # and uic. Listed below are macros that may be used to process those files. # diff --git a/Modules/UseQt4.cmake b/Modules/UseQt4.cmake index e8166f4..f05a3d5 100644 --- a/Modules/UseQt4.cmake +++ b/Modules/UseQt4.cmake @@ -25,7 +25,11 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_DEBUG) 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_PLUGINS "") @@ -89,7 +93,11 @@ foreach(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN if(QT_USE_${module}) string(REPLACE "QT" "" qt_module_def "${module}") 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() set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIBRARY}) set(QT_LIBRARIES_PLUGINS ${QT_LIBRARIES_PLUGINS} ${QT_${module}_PLUGINS}) |