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 a04d50e5ba6bdc81ce2b09d683afbc6d5e1a1a66 (commit)
via f68ca6cec7956a8a152d03d760517f64d3716f94 (commit)
from d13b3c756347497a626a9964e6e5b8945b00fd6a (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=a04d50e5ba6bdc81ce2b09d683afbc6d5e1a1a66
commit a04d50e5ba6bdc81ce2b09d683afbc6d5e1a1a66
Merge: d13b3c7 f68ca6c
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Fri Dec 19 17:38:57 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Dec 19 17:38:57 2014 -0500
Merge topic 'macho-parser' into next
f68ca6ce Fix compile errors when targeting 10.4 or less.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f68ca6cec7956a8a152d03d760517f64d3716f94
commit f68ca6cec7956a8a152d03d760517f64d3716f94
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Fri Dec 19 15:37:48 2014 -0700
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Fri Dec 19 15:38:46 2014 -0700
Fix compile errors when targeting 10.4 or less.
diff --git a/Source/cmMachO.cxx b/Source/cmMachO.cxx
index fab8a4d..d2f07d0 100644
--- a/Source/cmMachO.cxx
+++ b/Source/cmMachO.cxx
@@ -18,6 +18,7 @@
#include <mach-o/loader.h>
#include <mach-o/fat.h>
+#include <AvailabilityMacros.h>
/**
@@ -400,7 +401,9 @@ 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 | 3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
