[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1310-g8634dd7

Stephen Kelly steveire at gmail.com
Thu Mar 20 11:08:55 EDT 2014


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  8634dd75c890ffeeda7e2f14862b2d56babc4426 (commit)
       via  c8be041fa21b8cd23856ab5a2e4b921822b7584c (commit)
      from  c87a788f076eea7142aaafe68a6cd83fb992d817 (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=8634dd75c890ffeeda7e2f14862b2d56babc4426
commit 8634dd75c890ffeeda7e2f14862b2d56babc4426
Merge: c87a788 c8be041
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 20 11:08:54 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 20 11:08:54 2014 -0400

    Merge topic 'target_compile_features' into next
    
    c8be041f Exclude on Xcode.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8be041fa21b8cd23856ab5a2e4b921822b7584c
commit c8be041fa21b8cd23856ab5a2e4b921822b7584c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 20 16:08:36 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Mar 20 16:08:36 2014 +0100

    Exclude on Xcode.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d8942e9..9ddca58 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -124,7 +124,8 @@ add_RunCMake_test(File_Generate)
 add_RunCMake_test(ExportWithoutLanguage)
 add_RunCMake_test(target_link_libraries)
 
-if (CMAKE_CXX_COMPILER_ID MATCHES "Borland")
+if (CMAKE_CXX_COMPILER_ID MATCHES "Borland"
+    OR CMAKE_GENERATOR MATCHES Xcode)
   set(target_compile_features_ARGS -DNO_UNKNOWN_COMPILER_TEST=1)
 endif()
 add_RunCMake_test(target_compile_features)

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list