[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-215-gb377afb

[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  b377afb9e39fd27b25d271847798971463cdd0e4 (commit)
       via  d8cba5368bd58c6113abd8617fe264579e97b48a (commit)
      from  988fc13c0e286c6ea26c7ab0d485733b8e663bbe (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=b377afb9e39fd27b25d271847798971463cdd0e4
commit b377afb9e39fd27b25d271847798971463cdd0e4
Merge: 988fc13 d8cba53
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 19 09:30:59 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 19 09:30:59 2016 -0500

    Merge topic 'test-XCTest-sdkroot' into next
    
    d8cba536 Tests: Fix XCTest when ENV{SDKROOT} is set


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8cba5368bd58c6113abd8617fe264579e97b48a
commit d8cba5368bd58c6113abd8617fe264579e97b48a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 19 09:28:27 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 19 09:28:27 2016 -0500

    Tests: Fix XCTest when ENV{SDKROOT} is set
    
    We use the host OS X version as the deployment target for this test.
    This breaks if the SDKROOT environment variable specifies an
    incompatible SDK version.  Explicitly specify `macosx` as the
    SDK so that CMake will automatically select a version matching
    the deployment target.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7bb0721..b43275a 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1644,7 +1644,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
 
   if(CMake_TEST_XCODE_VERSION AND NOT CMake_TEST_XCODE_VERSION VERSION_LESS 5
      AND OSX_VERSION MATCHES "^([0-9]+\\.[0-9]+)")
-    set(XCTest_BUILD_OPTIONS -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_MATCH_1})
+    set(XCTest_BUILD_OPTIONS -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_MATCH_1} -DCMAKE_OSX_SYSROOT=macosx)
     ADD_TEST_MACRO(XCTest ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION> -V)
   endif()
 

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

Summary of changes:
 Tests/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake