[Cmake-commits] CMake branch, next, updated. v3.5.1-657-g021e01c

[Gregor Jasny]

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  021e01c423475f7c358a50775e0fc4073be8e75c (commit)
       via  62473f5689e6b03ec92b266b5feb822aec2b88dc (commit)
      from  7d8ab1b2b2ee7cc15940cf6e97ba034d91bbb074 (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=021e01c423475f7c358a50775e0fc4073be8e75c
commit 021e01c423475f7c358a50775e0fc4073be8e75c
Merge: 7d8ab1b 62473f5
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Mar 25 17:35:18 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 25 17:35:18 2016 -0400

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62473f5689e6b03ec92b266b5feb822aec2b88dc
commit 62473f5689e6b03ec92b266b5feb822aec2b88dc
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Mar 25 22:20:14 2016 +0100
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Fri Mar 25 22:20:14 2016 +0100

    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:
 Modules/FindXCTest.cmake |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake