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 57d720f763f58ea0ab5127c590d4ce0ad9976567 (commit) via f248cd4724f062c4821d601bebd9b99fc2ba477a (commit) from a04d50e5ba6bdc81ce2b09d683afbc6d5e1a1a66 (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=57d720f763f58ea0ab5127c590d4ce0ad9976567 commit 57d720f763f58ea0ab5127c590d4ce0ad9976567 Merge: a04d50e f248cd4 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Fri Dec 19 17:51:10 2014 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Dec 19 17:51:10 2014 -0500 Merge topic 'macho-parser' into next f248cd47 Remove LC_REEXPORT_DYLIB from logic to identify install name. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f248cd4724f062c4821d601bebd9b99fc2ba477a commit f248cd4724f062c4821d601bebd9b99fc2ba477a Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Fri Dec 19 15:50:22 2014 -0700 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Fri Dec 19 15:50:22 2014 -0700 Remove LC_REEXPORT_DYLIB from logic to identify install name. It wasn't supposed to be there in the first place. diff --git a/Source/cmMachO.cxx b/Source/cmMachO.cxx index d2f07d0..e9e76fa 100644 --- a/Source/cmMachO.cxx +++ b/Source/cmMachO.cxx @@ -18,8 +18,6 @@ #include <mach-o/loader.h> #include <mach-o/fat.h> -#include <AvailabilityMacros.h> - /** https://developer.apple.com/library/mac/documentation/ @@ -401,9 +399,6 @@ bool cmMachO::GetInstallName(std::string& install_name) uint32_t lc_cmd = cmd.type(macho); if(lc_cmd == LC_ID_DYLIB || lc_cmd == LC_LOAD_WEAK_DYLIB || -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 - lc_cmd == LC_REEXPORT_DYLIB || -#endif lc_cmd == LC_LOAD_DYLIB) { if(sizeof(dylib_command) < cmd.LoadCommand.size()) ----------------------------------------------------------------------- Summary of changes: Source/cmMachO.cxx | 5 ----- 1 file changed, 5 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits