[Cmake-commits] CMake branch, next, updated. v3.2.1-1713-gbcf878b

[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  bcf878b072063e3f8d3dcf7935deb4e2c7dc9319 (commit)
       via  c9e9c31c53f69475aa080ad442492408217259b5 (commit)
      from  679d43443a904e71cf5880e5dee1dbbcdd921be9 (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=bcf878b072063e3f8d3dcf7935deb4e2c7dc9319
commit bcf878b072063e3f8d3dcf7935deb4e2c7dc9319
Merge: 679d434 c9e9c31
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 10 12:48:16 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 10 12:48:16 2015 -0400

    Merge topic 'emulator-property' into next
    
    c9e9c31c Tests: Create pseudo_emulator output dir for Xcode 2.x


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9e9c31c53f69475aa080ad442492408217259b5
commit c9e9c31c53f69475aa080ad442492408217259b5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 10 12:42:49 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 10 12:42:49 2015 -0400

    Tests: Create pseudo_emulator output dir for Xcode 2.x
    
    Apply the workardound from commit v2.8.2~598 (Create CMakeLibTests
    output dir for Xcode, 2009-12-09) to the pseudo_emulator tool.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 977721d..0ffae0e 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -230,3 +230,11 @@ endif()
 add_executable(pseudo_emulator pseudo_emulator.c)
 add_RunCMake_test(CrosscompilingEmulator
  -DPSEUDO_EMULATOR=$<TARGET_FILE:pseudo_emulator>)
+# 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 pseudo_emulator
+    PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CFG_INTDIR}"
+    )
+endif()

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake