[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3091-g6a60e6e

Brad King brad.king at kitware.com
Mon Jul 15 09:19:15 EDT 2013


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  6a60e6e276027f3b9a49a0607abc96fc3479248c (commit)
       via  538805b8b6eb2c42c20c49951d6bb339c5b7f37a (commit)
      from  9911513147b7831e972b1cc5a939c80b2593934c (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=6a60e6e276027f3b9a49a0607abc96fc3479248c
commit 6a60e6e276027f3b9a49a0607abc96fc3479248c
Merge: 9911513 538805b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 15 09:18:32 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 15 09:18:32 2013 -0400

    Merge topic 'tid-system-argument' into next
    
    538805b Skip -isystem test with Bullseye Coverage tools


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=538805b8b6eb2c42c20c49951d6bb339c5b7f37a
commit 538805b8b6eb2c42c20c49951d6bb339c5b7f37a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 15 09:12:44 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 15 09:12:44 2013 -0400

    Skip -isystem test with Bullseye Coverage tools
    
    The Bullseye "g++" compiler does not appear to honor -isystem and
    still reports -Wunused-variable messages.

diff --git a/Tests/IncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/CMakeLists.txt
index 5eac1bb..596a280 100644
--- a/Tests/IncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -6,6 +6,13 @@ if (((CMAKE_C_COMPILER_ID STREQUAL GNU AND CMAKE_C_COMPILER_VERSION VERSION_GREA
     AND (CMAKE_GENERATOR STREQUAL "Unix Makefiles" OR CMAKE_GENERATOR STREQUAL "Ninja"))
   include(CheckCXXCompilerFlag)
   check_cxx_compiler_flag(-Wunused-variable run_sys_includes_test)
+  if(run_sys_includes_test)
+    # The Bullseye wrapper appears to break the -isystem effect.
+    execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version OUTPUT_VARIABLE out ERROR_VARIABLE out)
+    if("x${out}" MATCHES "Bullseye")
+      set(run_sys_includes_test 0)
+    endif()
+  endif()
   if (run_sys_includes_test)
     add_subdirectory(SystemIncludeDirectories)
   endif()

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

Summary of changes:
 Tests/IncludeDirectories/CMakeLists.txt |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list