[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1312-g6be768d

Stephen Kelly steveire at gmail.com
Thu Mar 20 13:22:16 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  6be768de6f73152c816db2dcbaced3208f33939e (commit)
       via  081c3c2043121be3aa52d7b940554431e7d49ec7 (commit)
      from  8634dd75c890ffeeda7e2f14862b2d56babc4426 (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=6be768de6f73152c816db2dcbaced3208f33939e
commit 6be768de6f73152c816db2dcbaced3208f33939e
Merge: 8634dd7 081c3c2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 20 13:22:15 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 20 13:22:15 2014 -0400

    Merge topic 'target_compile_features' into next
    
    081c3c20 Exclude Visual Studio.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=081c3c2043121be3aa52d7b940554431e7d49ec7
commit 081c3c2043121be3aa52d7b940554431e7d49ec7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 20 18:21:42 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Mar 20 18:21:42 2014 +0100

    Exclude Visual Studio.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 9ddca58..37d09ba 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -125,7 +125,8 @@ add_RunCMake_test(ExportWithoutLanguage)
 add_RunCMake_test(target_link_libraries)
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Borland"
-    OR CMAKE_GENERATOR MATCHES Xcode)
+    OR CMAKE_GENERATOR MATCHES Xcode
+    OR CMAKE_GENERATOR MATCHES "Visual Studio")
   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