[Cmake-commits] CMake branch, next, updated. v3.2.2-3017-g6e7f531

[Brad King]

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  6e7f5313aae143287e158b1e1d38765b85fcf291 (commit)
       via  0d937f5043e38fbab232ef2aa88e0b07d56264d7 (commit)
      from  abcab61f7ec66715040b67fb42b04aec43cdff92 (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=6e7f5313aae143287e158b1e1d38765b85fcf291
commit 6e7f5313aae143287e158b1e1d38765b85fcf291
Merge: abcab61 0d937f5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 20 09:01:30 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 20 09:01:30 2015 -0400

    Merge topic 'cmake-gui-osx-install-command-line' into next
    
    0d937f50 fixup! cmake-gui: Add --install option to add command-line tools on OS X


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d937f5043e38fbab232ef2aa88e0b07d56264d7
commit 0d937f5043e38fbab232ef2aa88e0b07d56264d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 20 08:53:57 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 20 08:53:57 2015 -0400

    fixup! cmake-gui: Add --install option to add command-line tools on OS X

diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index 4da33de..2d336ee 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -193,8 +193,10 @@ int main(int argc, char** argv)
 }
 
 #if defined(Q_OS_MAC)
-# include <unistd.h>
+# include <errno.h>
+# include <string.h>
 # include <sys/stat.h>
+# include <unistd.h>
 static bool cmOSXInstall(std::string const& dir, std::string const& tool)
 {
   if (tool.empty())

-----------------------------------------------------------------------

Summary of changes:
 Source/QtDialog/CMakeSetup.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake