diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-17 18:52:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-17 18:52:51 (GMT) |
| commit | 386bec2d9d7b5d6cf3d919fe6b8ca69519bdf23a (patch) | |
| tree | 0a93cd29e7d0b5daf5c60c05ea50301ff4f69109 | |
| parent | 3313bf06eb3e8ca3ca655f85e216368e61ee620d (diff) | |
| parent | 862dbe1367ed123b0a6eb8171bae0064fd7fa79f (diff) | |
| download | CMake-386bec2d9d7b5d6cf3d919fe6b8ca69519bdf23a.zip CMake-386bec2d9d7b5d6cf3d919fe6b8ca69519bdf23a.tar.gz CMake-386bec2d9d7b5d6cf3d919fe6b8ca69519bdf23a.tar.bz2 | |
Merge topic 'xcode12-link-matching-zlib'
862dbe1367 Xcode: Link matching zlib for iOS Simulator SDK
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5125
| -rw-r--r-- | Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake index cd6fd06..ed300bb 100644 --- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake +++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake @@ -310,10 +310,10 @@ endif() if(XCODE_VERSION VERSION_GREATER_EQUAL 8) function(XcodeRemoveExcessiveISystemSDK SDK) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeRemoveExcessiveISystemSDK-${SDK}-build) - set(RunCMake_TEST_OPTIONS "-DCMAKE_SYSTEM_NAME=iOS") + set(RunCMake_TEST_OPTIONS "-DCMAKE_SYSTEM_NAME=iOS" "-DCMAKE_OSX_SYSROOT=${SDK}") run_cmake(XcodeRemoveExcessiveISystem) set(RunCMake_TEST_NO_CLEAN 1) - run_cmake_command(XcodeRemoveExcessiveISystemSDK-${SDK}-build ${CMAKE_COMMAND} --build . -- -sdk ${SDK}) + run_cmake_command(XcodeRemoveExcessiveISystemSDK-${SDK}-build ${CMAKE_COMMAND} --build .) endfunction() XcodeRemoveExcessiveISystemSDK(iphoneos) |