[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1306-gb456537

[Stephen Kelly]

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  b456537c62112d47662b9e60596384aea3303dd5 (commit)
       via  d3e4e1c7a33e15fc4e9b59d190fe40f7efbcdb8b (commit)
      from  f629b06cb3ecc1d6dc8a52f20adefb7ac0b1103a (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=b456537c62112d47662b9e60596384aea3303dd5
commit b456537c62112d47662b9e60596384aea3303dd5
Merge: f629b06 d3e4e1c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 20 11:02:06 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 20 11:02:06 2014 -0400

    Merge topic 'target_compile_features' into next
    
    d3e4e1c7 Exclude on Borland.


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

    Exclude on Borland.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 669a1b4..d8942e9 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -123,6 +123,10 @@ endif()
 add_RunCMake_test(File_Generate)
 add_RunCMake_test(ExportWithoutLanguage)
 add_RunCMake_test(target_link_libraries)
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Borland")
+  set(target_compile_features_ARGS -DNO_UNKNOWN_COMPILER_TEST=1)
+endif()
 add_RunCMake_test(target_compile_features)
 add_RunCMake_test(CheckModules)
 add_RunCMake_test(CommandLine)
diff --git a/Tests/RunCMake/target_compile_features/RunCMakeTest.cmake b/Tests/RunCMake/target_compile_features/RunCMakeTest.cmake
index fa18558..740a973 100644
--- a/Tests/RunCMake/target_compile_features/RunCMakeTest.cmake
+++ b/Tests/RunCMake/target_compile_features/RunCMakeTest.cmake
@@ -9,7 +9,7 @@ run_cmake(imported_target)
 run_cmake(no_target)
 run_cmake(not_a_cxx_feature)
 run_cmake(no_matching_cxx_feature)
-if (NOT CMAKE_GENERATOR MATCHES "Borland")
+if (NOT NO_UNKNOWN_COMPILER_TEST)
   set(RunCMake_TEST_OPTIONS "-DCMAKE_CXX_COMPILER_ID=UnknownCompiler")
   run_cmake(unknown_compiler)
 endif()

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt                             |    4 ++++
 Tests/RunCMake/target_compile_features/RunCMakeTest.cmake |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake