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/03/01 19:30:07 UTC
[11/11] mesos git commit: CMake: Fixed Find* scripts to not explode
if invoked twice.
CMake: Fixed Find* scripts to not explode if invoked twice.
Review: https://reviews.apache.org/r/43700/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ab5547dd
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ab5547dd
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ab5547dd
Branch: refs/heads/master
Commit: ab5547dd886185476e4c5791c3710b398790d51a
Parents: ded4544
Author: Alex Clemmer <cl...@gmail.com>
Authored: Mon Feb 29 15:31:07 2016 -0800
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Tue Mar 1 10:25:58 2016 -0800
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/stout/cmake/FindApr.cmake | 7 +++++++
3rdparty/libprocess/3rdparty/stout/cmake/FindSvn.cmake | 5 +++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ab5547dd/3rdparty/libprocess/3rdparty/stout/cmake/FindApr.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/cmake/FindApr.cmake b/3rdparty/libprocess/3rdparty/stout/cmake/FindApr.cmake
index 4b28aa1..9d55ba0 100644
--- a/3rdparty/libprocess/3rdparty/stout/cmake/FindApr.cmake
+++ b/3rdparty/libprocess/3rdparty/stout/cmake/FindApr.cmake
@@ -39,6 +39,13 @@
# CONFIGURE THE APR SEARCH. Specify what we're looking for, and which directories
# we're going to look through to find them.
#############################################################################
+unset(APRUTIL_LIB)
+unset(APRUTIL_INCLUDE_DIR)
+unset(APR_LIB)
+unset(APR_INCLUDE_DIR)
+unset(APR_LIBS)
+unset(APR_FOUND)
+
set(POSSIBLE_APR_INCLUDE_DIRS
${POSSIBLE_APR_INCLUDE_DIRS}
/opt/homebrew/opt/apr/include/apr-1
http://git-wip-us.apache.org/repos/asf/mesos/blob/ab5547dd/3rdparty/libprocess/3rdparty/stout/cmake/FindSvn.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/cmake/FindSvn.cmake b/3rdparty/libprocess/3rdparty/stout/cmake/FindSvn.cmake
index c975a16..e85e882 100644
--- a/3rdparty/libprocess/3rdparty/stout/cmake/FindSvn.cmake
+++ b/3rdparty/libprocess/3rdparty/stout/cmake/FindSvn.cmake
@@ -35,6 +35,11 @@
# CONFIGURE OUR SEARCH. Specify what we're looking for, and which directories
# we're going to look through to find them.
#############################################################################
+unset(SVN_LIB)
+unset(SVN_INCLUDE_DIR)
+unset(SVN_LIBS)
+unset(SVN_FOUND)
+
set(POSSIBLE_SVN_INCLUDE_DIRECTORIES
${POSSIBLE_SVN_INCLUDE_DIRECTORIES}
/usr/local/include/subversion-1