[Cmake-commits] CMake branch, next, updated. v2.8.6-1867-g324f819

[Brad King]

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  324f819fecfda80a014da2bf82d82b662d0226d1 (commit)
       via  365b613f91da1844cb7daee9aee39559ec06c7c8 (commit)
       via  a8f6159f69dbfdacf4d48ff26f21862d83fa7fd8 (commit)
      from  9958122422b06d3056c272d908c0663202ece472 (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=324f819fecfda80a014da2bf82d82b662d0226d1
commit 324f819fecfda80a014da2bf82d82b662d0226d1
Merge: 9958122 365b613
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 14 07:59:25 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 14 07:59:25 2011 -0500

    Merge topic 'import-KWIML' into next
    
    365b613 Merge branch 'upstream-kwiml' into import-KWIML
    a8f6159 KWIML: Create test output dir for Xcode


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=365b613f91da1844cb7daee9aee39559ec06c7c8
commit 365b613f91da1844cb7daee9aee39559ec06c7c8
Merge: e2a0455 a8f6159
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 14 07:58:31 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 14 07:58:31 2011 -0500

    Merge branch 'upstream-kwiml' into import-KWIML


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8f6159f69dbfdacf4d48ff26f21862d83fa7fd8
commit a8f6159f69dbfdacf4d48ff26f21862d83fa7fd8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 14 07:53:06 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 14 07:54:10 2011 -0500

    KWIML: Create test output dir for Xcode
    
    Xcode 2.x forgets to create the target output directory before linking
    the individual architecture pieces of a universal binary for the target
    KWIML_test.  Then it passes the directory to -L and -F options when
    linking the and warns that the directory does not exist.  We work around
    the problem by using a pre-build rule on the target to create the output
    directory.

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 15816cf..febc994 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -56,3 +56,13 @@ set_property(TARGET ${KWIML}_test PROPERTY
   RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 add_test(${KWIML}.test ${CMAKE_CURRENT_BINARY_DIR}/${KWIML}_test)
 set_property(TEST ${KWIML}.test PROPERTY LABELS ${KWIML_LABELS_TEST})
+
+# Xcode 2.x forgets to create the output directory before linking
+# the individual architectures.
+if(CMAKE_OSX_ARCHITECTURES AND XCODE
+    AND NOT "${XCODE_VERSION}" MATCHES "^[^12]")
+  add_custom_command(
+    TARGET ${KWIML}_test
+    PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CFG_INTDIR}"
+    )
+endif()

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

Summary of changes:
 Utilities/KWIML/test/CMakeLists.txt |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake