[Cmake-commits] CMake branch, next, updated. v3.5.1-659-ge5d7429

[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  e5d7429c7033f1e67833fc55689f14cbd23146b8 (commit)
       via  a364d2513a3fac76cf12cf3db21b7e9600ac51a4 (commit)
      from  021e01c423475f7c358a50775e0fc4073be8e75c (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5d7429c7033f1e67833fc55689f14cbd23146b8
commit e5d7429c7033f1e67833fc55689f14cbd23146b8
Merge: 021e01c a364d25
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 28 09:23:54 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 28 09:23:54 2016 -0400

    Merge topic 'xcode73-xctest-location' into next
    
    a364d251 Xcode: Fixup XCTest bundle location for Xcode 7.3


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a364d2513a3fac76cf12cf3db21b7e9600ac51a4
commit a364d2513a3fac76cf12cf3db21b7e9600ac51a4
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Mar 25 22:20:14 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 28 09:23:35 2016 -0400

    Xcode: Fixup XCTest bundle location for Xcode 7.3
    
    Prior to Xcode 7.3 a XCTest bundle was built like an ordinary
    bundle. But starting with Xcode 7.3 it is implicitely built as
    a plugin for the test host. It looks like in that case the
    'Build Products Path' is ignored.
    
    This patch simply sets the CMake target output path to the value
    Xcode expects internally to get a matching view of both.
    
    The command:
    
      xcodebuild -showBuildSettings -target CocoaExampleTests -configuration Debug
    
    Output with Xcode 7.2:
    
      TARGET_BUILD_DIR = .../Tests/XCTest/Debug
    
    Output with Xcode 7.3
    
      TARGET_BUILD_DIR = .../Tests/XCTest/Debug/CocoaExample.app/Contents/PlugIns
    
    Signed-off-by: Gregor Jasny <gjasny at googlemail.com>

diff --git a/Modules/FindXCTest.cmake b/Modules/FindXCTest.cmake
index 3cd9c22..805a58c 100644
--- a/Modules/FindXCTest.cmake
+++ b/Modules/FindXCTest.cmake
@@ -140,6 +140,10 @@ function(xctest_add_bundle target testee)
       set_target_properties(${target} PROPERTIES
         XCODE_ATTRIBUTE_BUNDLE_LOADER "$(TEST_HOST)"
         XCODE_ATTRIBUTE_TEST_HOST "$<TARGET_FILE:${testee}>")
+      if(NOT XCODE_VERSION VERSION_LESS 7.3)
+        set_target_properties(${target} PROPERTIES
+          LIBRARY_OUTPUT_DIRECTORY "$<TARGET_FILE_DIR:${testee}>/../PlugIns")
+      endif()
     else(XCODE)
       target_link_libraries(${target}
         PRIVATE -bundle_loader $<TARGET_FILE:${testee}>)

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

Summary of changes:


hooks/post-receive
-- 
CMake