[Cmake-commits] CMake branch, next, updated. v2.8.6-1512-gef78b39

[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  ef78b3971ef2d0502f4bd9a6083a9ca3883ff25c (commit)
       via  279e66e5a9f27a326fa8397093af2ca107fc6e7e (commit)
      from  b4da0da63e02a50091b8b2a8048502257fa86a58 (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=ef78b3971ef2d0502f4bd9a6083a9ca3883ff25c
commit ef78b3971ef2d0502f4bd9a6083a9ca3883ff25c
Merge: b4da0da 279e66e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 5 12:01:34 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 5 12:01:34 2011 -0400

    Merge topic 'cmake-link-interface-libraries' into next
    
    279e66e Don't test for failure on APPLE.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=279e66e5a9f27a326fa8397093af2ca107fc6e7e
commit 279e66e5a9f27a326fa8397093af2ca107fc6e7e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 5 18:00:24 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 5 18:00:53 2011 +0200

    Don't test for failure on APPLE.
    
    This fails for a reason I do not know because I'm not familiar with Apple.

diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
index 94029bf..41224d0 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -163,20 +163,24 @@ 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.
-if (NOT WIN32)
-  # ... but not on windows apparently
-  expect_fail(True False
-    classB classC
-  LIBS
-    libC
-)
-endif()
+if (NOT APPLE)
+  # Apparently this doesn't work on APPLE either.
+  # http://www.cdash.org/CDash/testDetails.php?test=117927753&build=1596834
+  if (NOT WIN32)
+    # This does not work on windows apparently
+    expect_fail(True False
+      classB classC
+    LIBS
+      libC
+  )
+  endif()
 
-expect_fail(True True
-    classB classC
-  LIBS
-    libC
-)
+  expect_fail(True True
+      classB classC
+    LIBS
+      libC
+  )
+endif()
 
 # Then we can still link the executable to libA directly of course to pass
 expect_pass(True False

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

Summary of changes:
 .../target_link_libraries/CMakeLists.txt           |   30 +++++++++++--------
 1 files changed, 17 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake