You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2015/12/11 22:56:30 UTC
[1/2] mesos git commit: CMake: Corrected linking path for gmock
libraries on Windows builds.
Repository: mesos
Updated Branches:
refs/heads/master 69d7e8e37 -> 5f67bdee4
CMake: Corrected linking path for gmock libraries on Windows builds.
Review: https://reviews.apache.org/r/39621
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5a5bd05f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5a5bd05f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5a5bd05f
Branch: refs/heads/master
Commit: 5a5bd05ffa22f3bef7ae3edc78c3c9b8a7f27f69
Parents: 69d7e8e
Author: Alex Clemmer <cl...@gmail.com>
Authored: Fri Dec 11 13:45:48 2015 -0800
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Fri Dec 11 13:56:14 2015 -0800
----------------------------------------------------------------------
3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5a5bd05f/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake b/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake
index 6eda46b..3a2e099 100644
--- a/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake
+++ b/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake
@@ -49,8 +49,8 @@ set(GTEST_INCLUDE_DIR ${GTEST_SRC}/include)
# Convenience variables for `lib` directories of built third-party dependencies.
if (WIN32)
- set(GMOCK_LIB_DIR ${GMOCK_ROOT}/msvc/2010/Debug)
- set(GTEST_LIB_DIR ${GMOCK_ROOT}-build/gtest/Debug)
+ set(GMOCK_LIB_DIR ${GMOCK_ROOT}-build/${CMAKE_BUILD_TYPE})
+ set(GTEST_LIB_DIR ${GMOCK_ROOT}-build/gtest/${CMAKE_BUILD_TYPE})
else (WIN32)
set(GMOCK_LIB_DIR ${GMOCK_ROOT}-lib/lib/)
set(GTEST_LIB_DIR ${GMOCK_ROOT}-build/gtest/lib/.libs)
[2/2] mesos git commit: Windows: Included headers to make
`stout/windows.hpp` standalone.
Posted by jo...@apache.org.
Windows: Included headers to make `stout/windows.hpp` standalone.
Review: https://reviews.apache.org/r/39620
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5f67bdee
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5f67bdee
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5f67bdee
Branch: refs/heads/master
Commit: 5f67bdee4d56f92f9d53892c3037e225aec7d661
Parents: 5a5bd05
Author: Alex Clemmer <cl...@gmail.com>
Authored: Fri Dec 11 13:46:10 2015 -0800
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Fri Dec 11 13:56:21 2015 -0800
----------------------------------------------------------------------
.../libprocess/3rdparty/stout/include/stout/windows.hpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5f67bdee/3rdparty/libprocess/3rdparty/stout/include/stout/windows.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/windows.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/windows.hpp
index 9f84673..43c85f5 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/windows.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/windows.hpp
@@ -14,9 +14,12 @@
#define __STOUT_WINDOWS_HPP__
-#include <direct.h> // For `_mkdir`.
-#include <fcntl.h> // For file access flags like `_O_CREAT`.
-#include <io.h> // For `_read`, `_write`.
+#include <direct.h> // For `_mkdir`.
+#include <fcntl.h> // For file access flags like `_O_CREAT`.
+#include <io.h> // For `_read`, `_write`.
+#include <stdlib.h> // For `_PATH_MAX`.
+
+#include <sys/stat.h> // For permissions flags.
#include <BaseTsd.h> // For `SSIZE_T`.
// We include `Winsock2.h` before `Windows.h` explicitly to avoid symbold