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 2017/01/12 01:45:32 UTC
[09/11] mesos git commit: CMake: Stopped searching for SVN and APR
after we've found them.
CMake: Stopped searching for SVN and APR after we've found them.
Currently, the CMake build system employs scripts to find system
installations of libsvn and libapr on Unix machines. These scripts
will always repeat the search from scratch, independent of whether
we've already searched for these libraries.
This commit will cause these scripts to terminate early if we've already
searched and found these libraries.
Review: https://reviews.apache.org/r/55038/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/938c70f9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/938c70f9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/938c70f9
Branch: refs/heads/master
Commit: 938c70f9d212d01af32322b17a4f660bf7ec7091
Parents: 1dee966
Author: Alex Clemmer <cl...@gmail.com>
Authored: Wed Jan 11 17:24:22 2017 -0800
Committer: Joseph Wu <jo...@apache.org>
Committed: Wed Jan 11 17:36:39 2017 -0800
----------------------------------------------------------------------
3rdparty/stout/cmake/FindApr.cmake | 5 ++++-
3rdparty/stout/cmake/FindSvn.cmake | 7 ++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/938c70f9/3rdparty/stout/cmake/FindApr.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/stout/cmake/FindApr.cmake b/3rdparty/stout/cmake/FindApr.cmake
index 98adeab..13156a5 100644
--- a/3rdparty/stout/cmake/FindApr.cmake
+++ b/3rdparty/stout/cmake/FindApr.cmake
@@ -39,12 +39,15 @@
# CONFIGURE THE APR SEARCH. Specify what we're looking for, and which directories
# we're going to look through to find them.
#############################################################################
+if (APR_FOUND)
+ return()
+endif (APR_FOUND)
+
unset(APRUTIL_LIB)
unset(APRUTIL_INCLUDE_DIR)
unset(APR_LIB)
unset(APR_INCLUDE_DIR)
unset(APR_LIBS)
-unset(APR_FOUND)
# NOTE: If this fails, stderr is ignored, and the output variable is empty.
# This has no deleterious effect our path search.
http://git-wip-us.apache.org/repos/asf/mesos/blob/938c70f9/3rdparty/stout/cmake/FindSvn.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/stout/cmake/FindSvn.cmake b/3rdparty/stout/cmake/FindSvn.cmake
index e85e882..d57eed9 100644
--- a/3rdparty/stout/cmake/FindSvn.cmake
+++ b/3rdparty/stout/cmake/FindSvn.cmake
@@ -35,10 +35,13 @@
# CONFIGURE OUR SEARCH. Specify what we're looking for, and which directories
# we're going to look through to find them.
#############################################################################
+if (SVN_FOUND)
+ return()
+endif (SVN_FOUND)
+
unset(SVN_LIB)
unset(SVN_INCLUDE_DIR)
unset(SVN_LIBS)
-unset(SVN_FOUND)
set(POSSIBLE_SVN_INCLUDE_DIRECTORIES
${POSSIBLE_SVN_INCLUDE_DIRECTORIES}
@@ -112,6 +115,8 @@ else ((NUM_FOUND_LIBS AND (NUM_REQD_LIBS EQUAL NUM_FOUND_LIBS)) AND
endif ((NUM_FOUND_LIBS AND (NUM_REQD_LIBS EQUAL NUM_FOUND_LIBS)) AND
SVN_INCLUDE_DIR_FOUND)
+set(SVN_FOUND 1)
+
# Export variables.
mark_as_advanced(
SVN_LIB