[Cmake-commits] CMake branch, next, updated. v2.8.12-3745-ga9bb8c8

[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  a9bb8c84510f125291ee233e3cb09e5d0a13df57 (commit)
       via  7a74a4fe690193eb1111772200e123546dc26961 (commit)
      from  b78fab04d97d902282a5236ea786e9b2697ab7ca (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=a9bb8c84510f125291ee233e3cb09e5d0a13df57
commit a9bb8c84510f125291ee233e3cb09e5d0a13df57
Merge: b78fab0 7a74a4f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 10 08:55:08 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 10 08:55:08 2013 -0400

    Merge topic 'INTERFACE_LIBRARY-build-targets' into next
    
    7a74a4f Exclude Borland makefiles from this test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a74a4fe690193eb1111772200e123546dc26961
commit 7a74a4fe690193eb1111772200e123546dc26961
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 10 14:54:03 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 10 14:54:03 2013 +0200

    Exclude Borland makefiles from this test.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index d673adb..c2abf60 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -261,7 +261,7 @@ if(BUILD_TESTING)
       PASS_REGULAR_EXPRESSION "(file is not of required architecture|does not match cputype|not the architecture being linked)")
   endif()
 
-  if(CMAKE_GENERATOR MATCHES Make)
+  if(CMAKE_GENERATOR MATCHES Make AND NOT BORLAND)
     add_test(InterfaceBuildTargets ${CMAKE_CTEST_COMMAND}
       --build-and-test
       "${CMake_SOURCE_DIR}/Tests/InterfaceBuildTargets"

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

Summary of changes:
 Tests/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake