[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1265-ga3d6238

[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  a3d62383d61b05ed21cf5f437693cf55ce6cca0a (commit)
       via  bd53d624daadbca4328153a5ec97debb65e336e5 (commit)
      from  068ac04e59808b8e9b08d3cb7ab65e69c054ad7a (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=a3d62383d61b05ed21cf5f437693cf55ce6cca0a
commit a3d62383d61b05ed21cf5f437693cf55ce6cca0a
Merge: 068ac04 bd53d62
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 20 09:00:32 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 20 09:00:32 2014 -0400

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


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

    Exclude on Borland.

diff --git a/Tests/RunCMake/target_compile_features/RunCMakeTest.cmake b/Tests/RunCMake/target_compile_features/RunCMakeTest.cmake
index fdf0c69..fa18558 100644
--- a/Tests/RunCMake/target_compile_features/RunCMakeTest.cmake
+++ b/Tests/RunCMake/target_compile_features/RunCMakeTest.cmake
@@ -9,5 +9,7 @@ run_cmake(imported_target)
 run_cmake(no_target)
 run_cmake(not_a_cxx_feature)
 run_cmake(no_matching_cxx_feature)
-set(RunCMake_TEST_OPTIONS "-DCMAKE_CXX_COMPILER_ID=UnknownCompiler")
-run_cmake(unknown_compiler)
+if (NOT CMAKE_GENERATOR MATCHES "Borland")
+  set(RunCMake_TEST_OPTIONS "-DCMAKE_CXX_COMPILER_ID=UnknownCompiler")
+  run_cmake(unknown_compiler)
+endif()

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

Summary of changes:
 Tests/RunCMake/target_compile_features/RunCMakeTest.cmake |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake