[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1196-g4db7a28

[Clinton Stimpson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4db7a28b21b1288d69ca7d141160773868723a76 (commit)
       via  691ac05d4049619407b6ff0b89207c5c77e21ae0 (commit)
      from  00f312620763c28e2d1a2789979183de9448e94c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4db7a28b21b1288d69ca7d141160773868723a76
commit 4db7a28b21b1288d69ca7d141160773868723a76
Merge: 00f3126 691ac05
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Dec 3 15:28:58 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 3 15:28:58 2012 -0500

    Merge topic 'qt4-include-as-system' into next
    
    691ac05 Qt4: Add SYSTEM option to include_directories.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=691ac05d4049619407b6ff0b89207c5c77e21ae0
commit 691ac05d4049619407b6ff0b89207c5c77e21ae0
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Dec 3 08:00:07 2012 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Dec 3 08:00:07 2012 -0700

    Qt4: Add SYSTEM option to include_directories.
    
    Thanks to Scott Bailey and Benjamin Kloster.

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})

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindQt4.cmake |    4 ++++
 Modules/UseQt4.cmake  |   12 ++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake