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:31 UTC
[09/42] mesos git commit: CMake: Removed unnecessary includes of
`StoutConfigure`.
CMake: Removed unnecessary includes of `StoutConfigure`.
Because stout is now an "interface" library, the necessary metadata
is carried along with the stout target and does not need to be
spelled out by the downstream targets that use stout. This means
that these downstream files do not need to include stout's CMake file.
Review: https://reviews.apache.org/r/61289/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ca240181
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ca240181
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ca240181
Branch: refs/heads/master
Commit: ca240181d2380a8f4da97f30100fb576676f5760
Parents: cd7ec91
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Mon Aug 7 18:24:57 2017 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Sun Sep 3 05:51:05 2017 -0700
----------------------------------------------------------------------
3rdparty/CMakeLists.txt | 2 +-
src/master/cmake/MasterConfigure.cmake | 2 --
src/slave/cmake/AgentConfigure.cmake | 2 --
3 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ca240181/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index f4feaf9..a36bc24 100755
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -327,7 +327,7 @@ list(
APPEND CMAKE_MODULE_PATH
${CMAKE_SOURCE_DIR}/3rdparty/stout/cmake
)
-include(StoutConfigure)
+# TODO(andschwa): Remove this when gmock and gtest can be included.
include(StoutTestsConfigure)
set(GOOGLETEST_URL ${FETCH_URL}/googletest-release-${GOOGLETEST_VERSION}.tar.gz)
http://git-wip-us.apache.org/repos/asf/mesos/blob/ca240181/src/master/cmake/MasterConfigure.cmake
----------------------------------------------------------------------
diff --git a/src/master/cmake/MasterConfigure.cmake b/src/master/cmake/MasterConfigure.cmake
index 173dc36..96f0d5b 100644
--- a/src/master/cmake/MasterConfigure.cmake
+++ b/src/master/cmake/MasterConfigure.cmake
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include(StoutConfigure)
-
# Define process library dependencies. Tells the process library build targets
# download/configure/build all third-party libraries before attempting to build.
################################################################################
http://git-wip-us.apache.org/repos/asf/mesos/blob/ca240181/src/slave/cmake/AgentConfigure.cmake
----------------------------------------------------------------------
diff --git a/src/slave/cmake/AgentConfigure.cmake b/src/slave/cmake/AgentConfigure.cmake
index af2f74f..0d70f91 100644
--- a/src/slave/cmake/AgentConfigure.cmake
+++ b/src/slave/cmake/AgentConfigure.cmake
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include(StoutConfigure)
-
set(LOGROTATE_CONTAINER_LOGGER_TARGET logrotate_container_logger
CACHE STRING "Library containing the logrotate container logger."
)