[Cmake-commits] CMake branch, next, updated. v2.8.6-1519-g87aaf03

[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  87aaf03c37fe1f34292fcd0c45282eb4dc1ca1ca (commit)
       via  abb75920d3305f074ca3ab39dab9eace5d89956d (commit)
       via  b1dcf04fd286e2c129309ee7fca865f68b3e4c98 (commit)
      from  1113dbe527ba46f1a6f54c3d1cfd0bf1a06c4640 (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=87aaf03c37fe1f34292fcd0c45282eb4dc1ca1ca
commit 87aaf03c37fe1f34292fcd0c45282eb4dc1ca1ca
Merge: 1113dbe abb7592
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 6 04:42:45 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 6 04:42:45 2011 -0400

    Merge topic 'cmake-link-interface-libraries' into next
    
    abb7592 These tests don't work on many platforms.
    b1dcf04 Move the dummy executable creation to the top.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=abb75920d3305f074ca3ab39dab9eace5d89956d
commit abb75920d3305f074ca3ab39dab9eace5d89956d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 6 10:36:48 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 6 10:36:48 2011 +0200

    These tests don't work on many platforms.

diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
index 2396bc0..0ff1a16 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -173,26 +173,26 @@ 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 (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()
 
 # Then we can still link the executable to libA directly of course to pass
 expect_pass(True False

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1dcf04fd286e2c129309ee7fca865f68b3e4c98
commit b1dcf04fd286e2c129309ee7fca865f68b3e4c98
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 6 10:36:02 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 6 10:36:02 2011 +0200

    Move the dummy executable creation to the top.

diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
index 41224d0..2396bc0 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -2,6 +2,18 @@ cmake_minimum_required(VERSION 2.8)
 
 project(target_link_libraries)
 
+file(WRITE
+  "${CMAKE_CURRENT_BINARY_DIR}/main.cxx"
+  "int main() { return 0; }
+"
+)
+
+add_executable(
+  target_link_libraries
+  "${CMAKE_CURRENT_BINARY_DIR}/main.cxx"
+)
+
+
 set (COUNT 0)
 macro(_do_build CLEAR_LINK_INTERFACE_LIBRARIES SPECIFY_LINK_INTERFACE_LIBRARIES)
   math(EXPR COUNT "${COUNT} + 1" )
@@ -207,14 +219,3 @@ expect_pass(True True
   LIBS
     libC
 )
-
-file(WRITE
-  "${CMAKE_CURRENT_BINARY_DIR}/main.cxx"
-  "int main() { return 0; }
-"
-)
-
-add_executable(
-  target_link_libraries
-  "${CMAKE_CURRENT_BINARY_DIR}/main.cxx"
-)

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

Summary of changes:
 .../target_link_libraries/CMakeLists.txt           |   63 ++++++++++----------
 1 files changed, 32 insertions(+), 31 deletions(-)


hooks/post-receive
-- 
CMake