[Cmake-commits] CMake branch, next, updated. v2.8.6-1508-g9e7a7f8

[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  9e7a7f82b132f70005f42df3c7f58dbdab116799 (commit)
       via  6c76475cdfe64a29a7d49861bbf3a8c8f894038a (commit)
       via  b60e8c4e7b27ca4feabb5bbdd24dced66cc05ff4 (commit)
      from  021cece31b7fc461940fe605252a4958ded66ac5 (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=9e7a7f82b132f70005f42df3c7f58dbdab116799
commit 9e7a7f82b132f70005f42df3c7f58dbdab116799
Merge: 021cece 6c76475
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 5 11:09:47 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 5 11:09:47 2011 -0400

    Merge topic 'cmake-link-interface-libraries' into next
    
    6c76475 Comment test on Windows.
    b60e8c4 Make the project name agree with the directory name.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c76475cdfe64a29a7d49861bbf3a8c8f894038a
commit 6c76475cdfe64a29a7d49861bbf3a8c8f894038a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 5 17:07:43 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 5 17:09:02 2011 +0200

    Comment test on Windows.
    
    Fails on my system. This is a central unit test for this feature.
    Need to find out later why it fails.

diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
index abaface..94029bf 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -163,11 +163,15 @@ expect_pass(False False
 
 # However, if we do clear it and don't explicitly link the executable to it, it fails,
 # whether we specify the link_interface_libraries properly or not.
-expect_fail(True False
+if (NOT WIN32)
+  # ... but not on windows apparently
+  expect_fail(True False
     classB classC
   LIBS
     libC
 )
+endif()
+
 expect_fail(True True
     classB classC
   LIBS

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b60e8c4e7b27ca4feabb5bbdd24dced66cc05ff4
commit b60e8c4e7b27ca4feabb5bbdd24dced66cc05ff4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 5 17:06:15 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 5 17:06:15 2011 +0200

    Make the project name agree with the directory name.
    
    Might help the solution file based cdash failures.

diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
index b7bb42f..abaface 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
-project(target_link_libraries_test)
+project(target_link_libraries)
 
 set (COUNT 0)
 macro(_do_build CLEAR_LINK_INTERFACE_LIBRARIES SPECIFY_LINK_INTERFACE_LIBRARIES)

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

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


hooks/post-receive
-- 
CMake