[Cmake-commits] CMake branch, next, updated. v2.8.12-3975-ga7b989c

[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  a7b989c2ae68faa8733b2a3acf601ef163fb860b (commit)
       via  f39c63f040888f4b96928338ccfcb000a04b367b (commit)
      from  3213734d14048e9c2aa921dc533f66a3a543b9c5 (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=a7b989c2ae68faa8733b2a3acf601ef163fb860b
commit a7b989c2ae68faa8733b2a3acf601ef163fb860b
Merge: 3213734 f39c63f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 15 10:00:39 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 15 10:00:39 2013 -0400

    Merge topic 'INTERFACE_LIBRARY-build-targets' into next
    
    f39c63f Change the name of the expected library for Borland and Watcom generators.


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

    Change the name of the expected library for Borland and Watcom generators.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 70c7021..d1ff7c7 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -261,9 +261,11 @@ if(BUILD_TESTING)
       PASS_REGULAR_EXPRESSION "(file is not of required architecture|does not match cputype|not the architecture being linked)")
   endif()
 
-  if(CMAKE_TEST_GENERATOR MATCHES Make
-      AND NOT CMAKE_TEST_GENERATOR MATCHES BORLAND
-      AND NOT CMAKE_TEST_GENERATOR MATCHES "Watcom WMake")
+  if(CMAKE_TEST_GENERATOR MATCHES Make)
+    set(InterfaceBuildTargets_libname testlib)
+    if (CMAKE_TEST_GENERATOR MATCHES "Borland|Watcom")
+      set(InterfaceBuildTargets_libname testlib.lib)
+    endif()
     add_test(InterfaceBuildTargets ${CMAKE_CTEST_COMMAND}
       --build-and-test
       "${CMake_SOURCE_DIR}/Tests/InterfaceBuildTargets"
@@ -272,7 +274,7 @@ if(BUILD_TESTING)
       ${build_generator_args}
       --build-project InterfaceBuildTargets
       --build-target iface
-      --test-command ${CMAKE_CMAKE_COMMAND} -E touch_nocreate testlib
+      --test-command ${CMAKE_CMAKE_COMMAND} -E touch_nocreate ${InterfaceBuildTargets_libname}
       )
     list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/InterfaceBuildTargets")
   endif()

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

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


hooks/post-receive
-- 
CMake