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:29 UTC
[07/42] mesos git commit: CMake: Removed `GroupSource` from `stout`.
CMake: Removed `GroupSource` from `stout`.
Source grouping is a cosmetic change that only has an effect if
you load this project into an IDE (such as XCode or Visual Studio).
The existing source grouping is brittle and is not vital for the
CMake build system MVP, so we are removing it to reduce code churn.
Review: https://reviews.apache.org/r/61287/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ae778e46
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ae778e46
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ae778e46
Branch: refs/heads/master
Commit: ae778e46ecdb8096ae8d69e584a69114d2226fd0
Parents: da357f4
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Mon Aug 7 18:09:48 2017 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Sun Sep 3 05:51:05 2017 -0700
----------------------------------------------------------------------
3rdparty/stout/cmake/StoutConfigure.cmake | 20 --------------------
3rdparty/stout/tests/CMakeLists.txt | 8 --------
2 files changed, 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae778e46/3rdparty/stout/cmake/StoutConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/stout/cmake/StoutConfigure.cmake b/3rdparty/stout/cmake/StoutConfigure.cmake
index 48b153a..a20fb95 100644
--- a/3rdparty/stout/cmake/StoutConfigure.cmake
+++ b/3rdparty/stout/cmake/StoutConfigure.cmake
@@ -27,26 +27,6 @@ if (NOT WIN32)
find_package(Svn REQUIRED)
endif ()
-include(GroupSource)
-
-# SOURCE GROUPS. Allows IDEs to group header files for projects taking a
-# dependency on this package.
-########################################################################
-file(
- GLOB_RECURSE
- STOUT_HEADERS
- "${STOUT_INCLUDE_DIR}/stout/*.hpp"
- "${STOUT_INCLUDE_DIR}/stout/*.h"
- )
-
-macro(GROUP_STOUT_HEADERS)
- GROUP_SOURCE(
- "Stout Public Headers"
- "${STOUT_INCLUDE_DIR}/stout"
- "${STOUT_INCLUDE_DIR}/stout"
- "*.h*")
-endmacro()
-
# DEFINE STOUT LIBRARY DEPENDENCIES. Tells the stout library build targets
# download/configure/build all third-party libraries before attempting to build.
################################################################################
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae778e46/3rdparty/stout/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/CMakeLists.txt b/3rdparty/stout/tests/CMakeLists.txt
index 74b8758..f18dabd 100644
--- a/3rdparty/stout/tests/CMakeLists.txt
+++ b/3rdparty/stout/tests/CMakeLists.txt
@@ -108,14 +108,6 @@ add_custom_command(
${CMAKE_SOURCE_DIR}/3rdparty/stout/tests/protobuf_tests.proto
DEPENDS ${CMAKE_SOURCE_DIR}/3rdparty/stout/tests/protobuf_tests.proto)
-GROUP_STOUT_HEADERS()
-
-GROUP_SOURCE(
- "tests"
- "${CMAKE_CURRENT_SOURCE_DIR}"
- "${CMAKE_CURRENT_SOURCE_DIR}"
- "*.[ch]*")
-
# TODO(andschwa): Remove when gmock and gtest are top-level targets.
link_directories(${STOUT_TEST_LIB_DIRS})