[Cmake-commits] CMake branch, next, updated. v2.8.6-1549-g70f3bb1

[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  70f3bb19750642c57572eb8be6b471531330b903 (commit)
       via  b5387ffef39dbd8ecb93d91db6e2068c2fa5a3b1 (commit)
      from  89af01e7740440b8ac12a5f983dae93b34911482 (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=70f3bb19750642c57572eb8be6b471531330b903
commit 70f3bb19750642c57572eb8be6b471531330b903
Merge: 89af01e b5387ff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 10 10:46:19 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 10 10:46:19 2011 -0400

    Merge topic 'cmake-link-interface-libraries' into next
    
    b5387ff Start enabling these tests so we can find out why they cause failures.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5387ffef39dbd8ecb93d91db6e2068c2fa5a3b1
commit b5387ffef39dbd8ecb93d91db6e2068c2fa5a3b1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 10 16:44:38 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 10 16:45:16 2011 +0200

    Start enabling these tests so we can find out why they cause failures.

diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
index 79c447e..68a0f18 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -226,27 +226,22 @@ expect_pass(False False
     libC
 )
 
-# # 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 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
-#   )
-# endif()
+# 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 (APPLE)
+  expect_fail(True False
+    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           |   37 ++++++++-----------
 1 files changed, 16 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
CMake