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/09/03 12:51:52 UTC
[30/42] mesos git commit: CMake: Removed `Mesos3rdpartyConfigure`
from `MesosConfigure`.
CMake: Removed `Mesos3rdpartyConfigure` from `MesosConfigure`.
The 3rdparty CMake code configures itself now.
Review: https://reviews.apache.org/r/61513/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/529b83b1
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/529b83b1
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/529b83b1
Branch: refs/heads/master
Commit: 529b83b17fbacd7da0ab3d2dadef0d78f1764736
Parents: b4933f1
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Sat Sep 2 20:34:30 2017 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Sun Sep 3 05:51:08 2017 -0700
----------------------------------------------------------------------
CMakeLists.txt | 2 --
cmake/MesosConfigure.cmake | 6 ------
2 files changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/529b83b1/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e18c2c..a9d2f03 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,8 +38,6 @@ set(MESOS_PACKAGE_SOVERSION 0)
# Paths that are searched when `include(...)` is called.
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/3rdparty/cmake)
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/3rdparty/libprocess/cmake)
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/3rdparty/stout/cmake)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/src/cmake)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/src/examples/cmake)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/src/master/cmake)
http://git-wip-us.apache.org/repos/asf/mesos/blob/529b83b1/cmake/MesosConfigure.cmake
----------------------------------------------------------------------
diff --git a/cmake/MesosConfigure.cmake b/cmake/MesosConfigure.cmake
index 4857a76..93a85e5 100755
--- a/cmake/MesosConfigure.cmake
+++ b/cmake/MesosConfigure.cmake
@@ -50,12 +50,6 @@ enable_testing()
#####################
include(CompilationConfigure)
-# THIRD-PARTY CONFIGURATION.
-############################
-# NOTE: The third-party configuration variables exported here are used
-# throughout the project, so it's important that this config script goes here.
-include(Mesos3rdpartyConfigure)
-
if (BUILD_SHARED_LIBS)
set(MESOS_DEFAULT_LIBRARY_LINKAGE "SHARED")
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)