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 2016/12/08 02:44:41 UTC
[5/6] mesos git commit: Windows: Added APR include path to libprocess
configuration.
Windows: Added APR include path to libprocess configuration.
Partially addresses MESOS-3447, as APR is a dependency of the SVN
facilities of Stout.
On Unix builds, APR is expected to have been installed on the system
prior to building Mesos (usually by a package manager). Since Windows
does not have a package manager or a reasonble way of automatically
discovering where a package is installed (aside from the registry), our
CMake build system takes it upon itself to manage these system
dependencies. This means that on Windows, we need to configure the
build to look for the APR headers in our custom-downloaded APR
repository. Currently, though, we are not doing this, so when we'll
hit a compile-time error if we try to build (e.g.) `svn.hpp`.
This commit will introduce the APR include paths as part of the build
against Stout. Since Stout is a header-only library, it is (right now)
incumbent on whoever is bundling Stout up to manage the third-party
dependencies of Stout. In our current implementation, libprocess manages
the APR dependency for Stout, hence, we put this logic in libprocess.
Review: https://reviews.apache.org/r/54462/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b5b1ead3
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b5b1ead3
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b5b1ead3
Branch: refs/heads/master
Commit: b5b1ead3a8c28b8b65f514fd7b030324a735a26d
Parents: 1648491
Author: Alex Clemmer <cl...@gmail.com>
Authored: Wed Dec 7 16:57:37 2016 -0800
Committer: Joseph Wu <jo...@apache.org>
Committed: Wed Dec 7 18:44:17 2016 -0800
----------------------------------------------------------------------
3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b5b1ead3/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
index 786e47e..e9eabd0 100644
--- a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
+++ b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
@@ -62,6 +62,7 @@ set(NVML_INCLUDE_DIR ${NVML_ROOT})
set(PICOJSON_INCLUDE_DIR ${PICOJSON_ROOT})
if (WIN32)
+ set(APR_INCLUDE_DIR ${LIBAPR_ROOT}/include ${LIBAPR_ROOT}-build)
set(CURL_INCLUDE_DIR ${CURL_ROOT}/include)
set(GLOG_INCLUDE_DIR ${GLOG_ROOT}/src/windows)
set(PROTOBUF_INCLUDE_DIR ${PROTOBUF_ROOT}/src)