[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2934-geaae637

Stephen Kelly steveire at gmail.com
Wed Jul 3 00:55:08 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  eaae6371b6445692a84e6c896ee7ac3be6242e66 (commit)
       via  36c9f12133af8740bd5871300b19fc8736287880 (commit)
      from  d2b20a8208aaf604386de069a95342015a9059e8 (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=eaae6371b6445692a84e6c896ee7ac3be6242e66
commit eaae6371b6445692a84e6c896ee7ac3be6242e66
Merge: d2b20a8 36c9f12
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jul 3 00:55:01 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 3 00:55:01 2013 -0400

    Merge topic 'tid-system-argument' into next
    
    36c9f12 Exclude some failing dashboards


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36c9f12133af8740bd5871300b19fc8736287880
commit 36c9f12133af8740bd5871300b19fc8736287880
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jul 3 06:54:08 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jul 3 06:54:08 2013 +0200

    Exclude some failing dashboards

diff --git a/Tests/IncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/CMakeLists.txt
index 258f55f..5eac1bb 100644
--- a/Tests/IncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -1,8 +1,9 @@
 cmake_minimum_required (VERSION 2.6)
 project(IncludeDirectories)
 
-if ((CMAKE_C_COMPILER_ID STREQUAL GNU AND CMAKE_C_COMPILER_VERSION VERSION_GREATER 3)
+if (((CMAKE_C_COMPILER_ID STREQUAL GNU AND CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.4)
     OR CMAKE_C_COMPILER_ID STREQUAL Clang)
+    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)

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list