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/28 02:16:01 UTC
[06/11] mesos git commit: CMake: Added source groups for libprocess.
CMake: Added source groups for libprocess.
This uses the recently-introduced CMake function, `GROUP_SOURCE`, to
automatically group libprocess sources. This makes sources appear
in a sensible directory structure in certain supported IDE's.
Review: https://reviews.apache.org/r/55604/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8bbfa510
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8bbfa510
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8bbfa510
Branch: refs/heads/master
Commit: 8bbfa5108ba4e5d2fe1b584bd8103274bc6631fc
Parents: 7cd8c6a
Author: Alex Clemmer <cl...@gmail.com>
Authored: Fri Jan 27 12:21:33 2017 -0800
Committer: Joseph Wu <jo...@apache.org>
Committed: Fri Jan 27 18:15:41 2017 -0800
----------------------------------------------------------------------
3rdparty/libprocess/cmake/ProcessConfigure.cmake | 17 +++++++++++++++++
3rdparty/libprocess/src/CMakeLists.txt | 9 +++++++++
3rdparty/libprocess/src/tests/CMakeLists.txt | 9 +++++++++
3 files changed, 35 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/8bbfa510/3rdparty/libprocess/cmake/ProcessConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/cmake/ProcessConfigure.cmake b/3rdparty/libprocess/cmake/ProcessConfigure.cmake
index 873f41d..2e695b5 100755
--- a/3rdparty/libprocess/cmake/ProcessConfigure.cmake
+++ b/3rdparty/libprocess/cmake/ProcessConfigure.cmake
@@ -44,6 +44,23 @@ set(PROCESS_PACKAGE_VERSION 0.0.1)
set(PROCESS_PACKAGE_SOVERSION 0)
set(PROCESS_TARGET process-${PROCESS_PACKAGE_VERSION})
+# SOURCE GROUPS. Allows IDEs to group header files for projects taking a
+# dependency on this package.
+########################################################################
+file(
+ GLOB_RECURSE
+ PROCESS_HEADERS
+ "${PROCESS_INCLUDE_DIR}/process/*.hpp"
+ )
+
+macro(GROUP_PROCESS_HEADERS)
+ GROUP_SOURCE(
+ "Libprocess Public Headers"
+ "${PROCESS_INCLUDE_DIR}/process"
+ "${PROCESS_INCLUDE_DIR}/process"
+ "*.h*")
+endmacro(GROUP_PROCESS_HEADERS)
+
# 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/8bbfa510/3rdparty/libprocess/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/CMakeLists.txt b/3rdparty/libprocess/src/CMakeLists.txt
index 60f0e76..d17cf9d 100644
--- a/3rdparty/libprocess/src/CMakeLists.txt
+++ b/3rdparty/libprocess/src/CMakeLists.txt
@@ -99,6 +99,15 @@ else (WIN32)
)
endif (WIN32)
+GROUP_STOUT_HEADERS()
+GROUP_PROCESS_HEADERS()
+
+GROUP_SOURCE(
+ "src"
+ "${CMAKE_CURRENT_SOURCE_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}"
+ "*.[ch]*")
+
set_target_properties(
${PROCESS_TARGET} PROPERTIES
VERSION ${PROCESS_PACKAGE_VERSION}
http://git-wip-us.apache.org/repos/asf/mesos/blob/8bbfa510/3rdparty/libprocess/src/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/CMakeLists.txt b/3rdparty/libprocess/src/tests/CMakeLists.txt
index 0b2660c..b298bbe 100644
--- a/3rdparty/libprocess/src/tests/CMakeLists.txt
+++ b/3rdparty/libprocess/src/tests/CMakeLists.txt
@@ -68,6 +68,15 @@ link_directories(${PROCESS_TEST_LIB_DIRS})
###############################################################################
add_executable(${PROCESS_TESTS_TARGET} ${PROCESS_TESTS_SRC})
+GROUP_STOUT_HEADERS()
+GROUP_PROCESS_HEADERS()
+
+GROUP_SOURCE(
+ "tests"
+ "${CMAKE_CURRENT_SOURCE_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}"
+ "*.[ch]*")
+
# ADD LINKER FLAGS (generates, e.g., -lglog on Linux).
######################################################
target_link_libraries(${PROCESS_TESTS_TARGET} ${PROCESS_TEST_LIBS})