[Cmake-commits] CMake branch, next, updated. v2.8.7-3405-g6816066
Brad King
brad.king at kitware.com
Tue Apr 3 16:11:14 EDT 2012
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 68160664982d8f42ccfa8d68de778df823b52979 (commit)
via a90d47890ffa4b029d40f6884d9bd6603297322b (commit)
from 0d1ba2baf8b1ab0b7b21bab5687f0a3a794f6544 (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=68160664982d8f42ccfa8d68de778df823b52979
commit 68160664982d8f42ccfa8d68de778df823b52979
Merge: 0d1ba2b a90d478
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 3 16:11:12 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 3 16:11:12 2012 -0400
Merge topic 'mac_environ' into next
a90d478 [OSX] Fixed undefined symbol when linking CMakeLib into shared library
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a90d47890ffa4b029d40f6884d9bd6603297322b
commit a90d47890ffa4b029d40f6884d9bd6603297322b
Author: Konstantin Tokarev <annulen at yandex.ru>
AuthorDate: Thu Mar 1 20:57:34 2012 +0400
Commit: Konstantin Tokarev <annulen at yandex.ru>
CommitDate: Sat Mar 3 19:33:35 2012 +0400
[OSX] Fixed undefined symbol when linking CMakeLib into shared library
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 15e689b..81ee5ce 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -104,6 +104,9 @@ public:
private:
HANDLE handle_;
};
+#elif defined(__APPLE__)
+#include <crt_externs.h>
+#define environ (*_NSGetEnviron())
#endif
bool cmSystemTools::s_RunCommandHideConsole = false;
-----------------------------------------------------------------------
Summary of changes:
Source/cmSystemTools.cxx | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list