[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2930-gd536fe2
Stephen Kelly
steveire at gmail.com
Tue Jul 2 14:01:48 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 d536fe284bc96366cf21d732c8690e21a4188752 (commit)
via 668ce55d5c7882c392570dd9be3660da408a5239 (commit)
from 0152df18083f667548d2de633f7bf0ac8d15c0ab (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=d536fe284bc96366cf21d732c8690e21a4188752
commit d536fe284bc96366cf21d732c8690e21a4188752
Merge: 0152df1 668ce55
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 2 14:01:41 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 2 14:01:41 2013 -0400
Merge topic 'tid-system-argument' into next
668ce55 Add a compiler feature test for -Wunused-variable.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=668ce55d5c7882c392570dd9be3660da408a5239
commit 668ce55d5c7882c392570dd9be3660da408a5239
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 2 19:08:02 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jul 2 20:00:02 2013 +0200
Add a compiler feature test for -Wunused-variable.
diff --git a/Tests/IncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/CMakeLists.txt
index 13754ea..258f55f 100644
--- a/Tests/IncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -1,6 +1,15 @@
cmake_minimum_required (VERSION 2.6)
project(IncludeDirectories)
+if ((CMAKE_C_COMPILER_ID STREQUAL GNU AND CMAKE_C_COMPILER_VERSION VERSION_GREATER 3)
+ OR CMAKE_C_COMPILER_ID STREQUAL Clang)
+ include(CheckCXXCompilerFlag)
+ check_cxx_compiler_flag(-Wunused-variable run_sys_includes_test)
+ if (run_sys_includes_test)
+ add_subdirectory(SystemIncludeDirectories)
+ endif()
+endif()
+
file(WRITE ${CMAKE_BINARY_DIR}/Flags/Flags.h
"//Flags.h
")
@@ -47,10 +56,6 @@ else()
endif()
add_subdirectory(TargetIncludeDirectories)
-if ((CMAKE_C_COMPILER_ID STREQUAL GNU AND CMAKE_C_COMPILER_VERSION VERSION_GREATER 3)
- OR CMAKE_C_COMPILER_ID STREQUAL Clang)
- add_subdirectory(SystemIncludeDirectories)
-endif()
set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}")
get_property(propContent DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
-----------------------------------------------------------------------
Summary of changes:
Tests/IncludeDirectories/CMakeLists.txt | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list