[Cmake-commits] CMake branch, next, updated. v2.8.12-3950-g879cdda

[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  879cdda6ee26269be4ed01a8fa17709cd67758f7 (commit)
       via  df46250b0a47687c40698621299d9be8ef5d75f6 (commit)
      from  44f9a1146e8eda190332ed1901b521b14ae65dd5 (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=879cdda6ee26269be4ed01a8fa17709cd67758f7
commit 879cdda6ee26269be4ed01a8fa17709cd67758f7
Merge: 44f9a11 df46250
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 14 19:15:29 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 14 19:15:29 2013 -0400

    Merge topic 'INTERFACE_LIBRARY-build-targets' into next
    
    df46250 Fix excluded configurations from running the InterfaceBuildTargets test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df46250b0a47687c40698621299d9be8ef5d75f6
commit df46250b0a47687c40698621299d9be8ef5d75f6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 15 01:14:35 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 15 01:14:35 2013 +0200

    Fix excluded configurations from running the InterfaceBuildTargets test.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index c2abf60..70c7021 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -261,7 +261,9 @@ 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 AND NOT BORLAND)
+  if(CMAKE_TEST_GENERATOR MATCHES Make
+      AND NOT CMAKE_TEST_GENERATOR MATCHES BORLAND
+      AND NOT CMAKE_TEST_GENERATOR MATCHES "Watcom WMake")
     add_test(InterfaceBuildTargets ${CMAKE_CTEST_COMMAND}
       --build-and-test
       "${CMake_SOURCE_DIR}/Tests/InterfaceBuildTargets"

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

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


hooks/post-receive
-- 
CMake