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 2016/11/29 00:20:38 UTC
[09/23] mesos git commit: CMake: Moved logrotate container logger
binary build definition.
CMake: Moved logrotate container logger binary build definition.
This was originally included at a higher level. Per CMake style,
build files should generally be included in the CMakeLists.txt file
located in the same directory.
Review: https://reviews.apache.org/r/53757/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/33fc68dd
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/33fc68dd
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/33fc68dd
Branch: refs/heads/master
Commit: 33fc68ddb2be9aa857f63a00457a338a6518aaf0
Parents: 93333f4
Author: Joseph Wu <jo...@mesosphere.io>
Authored: Mon Nov 28 15:32:36 2016 -0800
Committer: Joseph Wu <jo...@apache.org>
Committed: Mon Nov 28 15:39:59 2016 -0800
----------------------------------------------------------------------
src/slave/CMakeLists.txt | 23 -----------------------
src/slave/container_loggers/CMakeLists.txt | 11 ++++++++++-
2 files changed, 10 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/33fc68dd/src/slave/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/slave/CMakeLists.txt b/src/slave/CMakeLists.txt
index 3380041..2c4d6a0 100644
--- a/src/slave/CMakeLists.txt
+++ b/src/slave/CMakeLists.txt
@@ -21,14 +21,6 @@ set(AGENT_EXECUTABLE_SRC
main.cpp
)
-# TODO(josephw): Port this to Windows.
-if (NOT WIN32)
- set(MESOS_LOGROTATE_LOGGER_SRC
- ${MESOS_LOGROTATE_LOGGER_SRC}
- container_loggers/logrotate.cpp
- )
-endif (NOT WIN32)
-
add_subdirectory(container_loggers)
add_subdirectory(qos_controllers)
add_subdirectory(resource_estimators)
@@ -47,25 +39,10 @@ link_directories(${AGENT_LIB_DIRS})
#######################
add_executable(${AGENT_TARGET} ${AGENT_EXECUTABLE_SRC})
-if (NOT WIN32)
- add_executable(${MESOS_LOGROTATE_LOGGER_TARGET} ${MESOS_LOGROTATE_LOGGER_SRC})
-endif (NOT WIN32)
-
# ADD LINKER FLAGS (generates, e.g., -lglog on Linux).
######################################################
target_link_libraries(${AGENT_TARGET} ${AGENT_LIBS} ${MESOS_TARGET})
-if (NOT WIN32)
- target_link_libraries(${MESOS_LOGROTATE_LOGGER_TARGET}
- ${AGENT_LIBS}
- ${MESOS_TARGET}
- )
-endif (NOT WIN32)
-
# ADD BINARY DEPENDENCIES (tells CMake what to compile/build first).
####################################################################
add_dependencies(${AGENT_TARGET} ${MESOS_TARGET})
-
-if (NOT WIN32)
- add_dependencies(${MESOS_LOGROTATE_LOGGER_TARGET} ${MESOS_TARGET})
-endif (NOT WIN32)
http://git-wip-us.apache.org/repos/asf/mesos/blob/33fc68dd/src/slave/container_loggers/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/slave/container_loggers/CMakeLists.txt b/src/slave/container_loggers/CMakeLists.txt
index 4b4ee19..6f0dd23 100644
--- a/src/slave/container_loggers/CMakeLists.txt
+++ b/src/slave/container_loggers/CMakeLists.txt
@@ -17,22 +17,31 @@
# Logrotate container logger sources.
#####################################
set(LOGROTATE_CONTAINER_LOGGER_SRC lib_logrotate.cpp)
+set(MESOS_LOGROTATE_LOGGER_SRC logrotate.cpp)
# Build the container logger module.
####################################
# NOTE: Modules are not supported on Windows.
if (NOT WIN32)
add_library(${LOGROTATE_CONTAINER_LOGGER_TARGET} SHARED ${LOGROTATE_CONTAINER_LOGGER_SRC})
+ add_executable(${MESOS_LOGROTATE_LOGGER_TARGET} ${MESOS_LOGROTATE_LOGGER_SRC})
endif (NOT WIN32)
# ADD LINKER FLAGS (generates, e.g., -lglog on Linux).
######################################################
if (NOT WIN32)
target_link_libraries(${LOGROTATE_CONTAINER_LOGGER_TARGET} ${MESOS_TARGET})
+ target_link_libraries(${MESOS_LOGROTATE_LOGGER_TARGET} ${MESOS_TARGET})
endif (NOT WIN32)
# ADD BINARY DEPENDENCIES (tells CMake what to compile/build first).
####################################################################
if (NOT WIN32)
- add_dependencies(${LOGROTATE_CONTAINER_LOGGER_TARGET} ${MESOS_TARGET})
+ add_dependencies(
+ ${LOGROTATE_CONTAINER_LOGGER_TARGET}
+ ${MESOS_TARGET}
+ ${MESOS_LOGROTATE_LOGGER_TARGET}
+ )
+
+ add_dependencies(${MESOS_LOGROTATE_LOGGER_TARGET} ${MESOS_TARGET})
endif (NOT WIN32)