You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2018/04/05 17:38:39 UTC
mesos git commit: Fixed build break on Windows.
Repository: mesos
Updated Branches:
refs/heads/master 240a25856 -> 887dfaf28
Fixed build break on Windows.
We do not use `make` on Windows, so this `FATAL_ERROR` when it's not
found broke the build.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/887dfaf2
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/887dfaf2
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/887dfaf2
Branch: refs/heads/master
Commit: 887dfaf28ebda153a3e4b6dd4b6c3aeaef9fc1e6
Parents: 240a258
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Thu Apr 5 10:37:18 2018 -0700
Committer: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Committed: Thu Apr 5 10:37:18 2018 -0700
----------------------------------------------------------------------
3rdparty/CMakeLists.txt | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/887dfaf2/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index c80cf3e..9d0fd55 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -55,17 +55,19 @@ if (WIN32)
set(GLOG_URL ${3RDPARTY_DEPENDENCIES}/glog-${GLOG_VERSION}.tar.gz)
endif ()
-# On platforms like FreeBSD where gmake is not the default, we need to look for
-# gmake explicitly to make sure LevelDB can build.
-# TODO(dforsyth): Remove this once LevelDB is upgraded to a version that uses
-# CMake (https://issues.apache.org/jira/browse/MESOS-8757).
-find_program(
- MAKE_PROGRAM
- NAMES gmake make
- DOCS "External 'make' executable.")
-
-if (NOT MAKE_PROGRAM)
- message(FATAL_ERROR "Could not find an external 'make' executable.")
+if (NOT WIN32)
+ # On platforms like FreeBSD where gmake is not the default, we need
+ # to look for gmake explicitly to make sure LevelDB can build.
+ # TODO(dforsyth): Remove this once LevelDB is upgraded to a version
+ # that uses CMake. See MESOS-8757.
+ find_program(
+ MAKE_PROGRAM
+ NAMES gmake make
+ DOCS "External 'make' executable.")
+
+ if (NOT MAKE_PROGRAM)
+ message(FATAL_ERROR "Could not find an external 'make' executable.")
+ endif ()
endif ()
# Helper utilities for dealing with third-party dependencies.