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 849ccc59e315e64b2c2c98d79ba2108810c461ca (commit) via 67f60958b61941264b0e2a63ad527dd346a6b1e3 (commit) from d70e7e1491ec53571d1948c89cf658393ebee406 (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=849ccc59e315e64b2c2c98d79ba2108810c461ca commit 849ccc59e315e64b2c2c98d79ba2108810c461ca Merge: d70e7e1 67f6095 Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Tue Aug 25 15:48:42 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Aug 25 15:48:42 2015 -0400 Merge topic 'apple-tbd-stubs' into next 67f60958 Darwin: Add support for tbd library stub files http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67f60958b61941264b0e2a63ad527dd346a6b1e3 commit 67f60958b61941264b0e2a63ad527dd346a6b1e3 Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Sat Aug 15 21:01:31 2015 +0200 Commit: Gregor Jasny <gja...@googlemail.com> CommitDate: Mon Aug 24 22:29:33 2015 +0200 Darwin: Add support for tbd library stub files Starting with Xcode 7 the OSX and iOS SDKs contain only stub files for dynamic system libraries. These stub files contain some meta data and a list of exported sysbols in plain text. They are handled by the toolchain like regular dylibs. diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index 4e4810a..bb085ac 100644 --- a/Modules/Platform/Darwin.cmake +++ b/Modules/Platform/Darwin.cmake @@ -53,7 +53,7 @@ set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib -Wl,-headerpad_max_install_ set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names") set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") -set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") +set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a") # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake index ef81739..1151abf 100644 --- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake +++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake @@ -39,3 +39,9 @@ if(NOT XCODE_VERSION VERSION_LESS 5) unset(RunCMake_TEST_NO_CLEAN) unset(RunCMake_TEST_OPTIONS) endif() + +if(NOT XCODE_VERSION VERSION_LESS 7) + set(RunCMake_TEST_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/osx.cmake") + run_cmake(XcodeTbdStub) + unset(RunCMake_TEST_OPTIONS) +endif() diff --git a/Tests/RunCMake/XcodeProject/XcodeTbdStub-stdout.txt b/Tests/RunCMake/XcodeProject/XcodeTbdStub-stdout.txt new file mode 100644 index 0000000..9d9e143 --- /dev/null +++ b/Tests/RunCMake/XcodeProject/XcodeTbdStub-stdout.txt @@ -0,0 +1 @@ +.*/libz\.tbd.* diff --git a/Tests/RunCMake/XcodeProject/XcodeTbdStub.cmake b/Tests/RunCMake/XcodeProject/XcodeTbdStub.cmake new file mode 100644 index 0000000..e83d7f3 --- /dev/null +++ b/Tests/RunCMake/XcodeProject/XcodeTbdStub.cmake @@ -0,0 +1,2 @@ +cmake_minimum_required(VERSION 3.3) +find_package(ZLIB REQUIRED) diff --git a/Tests/RunCMake/XcodeProject/osx.cmake b/Tests/RunCMake/XcodeProject/osx.cmake new file mode 100644 index 0000000..e021fcd --- /dev/null +++ b/Tests/RunCMake/XcodeProject/osx.cmake @@ -0,0 +1,18 @@ +set(CMAKE_SYSTEM_NAME Darwin) +set(CMAKE_SYSTEM_VERSION 1) +set(UNIX True) +set(APPLE True) + +find_program(XCRUN_EXECUTABLE xcrun) +if(NOT XCRUN_EXECUTABLE) + message(FATAL_ERROR "xcrun not found") +endif() + +execute_process( + COMMAND ${XCRUN_EXECUTABLE} --sdk macosx --show-sdk-path + OUTPUT_VARIABLE OSX_SDK_PATH + OUTPUT_STRIP_TRAILING_WHITESPACE) + +set(CMAKE_OSX_SYSROOT ${OSX_SDK_PATH} CACHE PATH "Sysroot used for OSX support") + +set(CMAKE_FIND_ROOT_PATH ${OSX_SDK_PATH} CACHE PATH "Find search path root") ----------------------------------------------------------------------- Summary of changes: Modules/Platform/Darwin.cmake | 2 +- Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 6 ++++++ Tests/RunCMake/XcodeProject/XcodeTbdStub-stdout.txt | 1 + Tests/RunCMake/XcodeProject/XcodeTbdStub.cmake | 2 ++ Tests/RunCMake/XcodeProject/osx.cmake | 18 ++++++++++++++++++ 5 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 Tests/RunCMake/XcodeProject/XcodeTbdStub-stdout.txt create mode 100644 Tests/RunCMake/XcodeProject/XcodeTbdStub.cmake create mode 100644 Tests/RunCMake/XcodeProject/osx.cmake hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits