Repository: mesos Updated Branches: refs/heads/master d580ecab3 -> 071ed5226
CMake: Added IO Switchboard to the build. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/071ed522 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/071ed522 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/071ed522 Branch: refs/heads/master Commit: 071ed5226be790aecd5ace1a7abda30b682078be Parents: b119718 Author: Joseph Wu <josep...@apache.org> Authored: Thu Dec 1 12:30:25 2016 -0800 Committer: Joseph Wu <josep...@apache.org> Committed: Thu Dec 1 12:47:40 2016 -0800 ---------------------------------------------------------------------- cmake/MesosConfigure.cmake | 4 ++++ src/slave/containerizer/mesos/CMakeLists.txt | 26 ++++++++++++----------- src/tests/CMakeLists.txt | 3 ++- 3 files changed, 20 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/071ed522/cmake/MesosConfigure.cmake ---------------------------------------------------------------------- diff --git a/cmake/MesosConfigure.cmake b/cmake/MesosConfigure.cmake index ed92144..9f747e9 100755 --- a/cmake/MesosConfigure.cmake +++ b/cmake/MesosConfigure.cmake @@ -137,6 +137,10 @@ set( CACHE STRING "Target for fetcher") set( + MESOS_IO_SWITCHBOARD mesos-io-switchboard + CACHE STRING "Target for the IO switchboard") + +set( MESOS_MASTER mesos-master CACHE STRING "Target for master") http://git-wip-us.apache.org/repos/asf/mesos/blob/071ed522/src/slave/containerizer/mesos/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/CMakeLists.txt b/src/slave/containerizer/mesos/CMakeLists.txt index da52559..a7596f2 100644 --- a/src/slave/containerizer/mesos/CMakeLists.txt +++ b/src/slave/containerizer/mesos/CMakeLists.txt @@ -21,25 +21,27 @@ set(CONTAINERIZER_EXECUTABLE_SRC main.cpp ) -# INCLUDE DIRECTIVES FOR CONTAINERIZER EXECUTABLE (generates, e.g., -# -I/path/to/thing on Linux). -################################################################### -include_directories(${AGENT_INCLUDE_DIRS}) - -# LINKING LIBRARIES BY DIRECTORY (might generate, e.g., -L/path/to/thing on -# Linux). -########################################################################### -link_directories(${AGENT_LIB_DIRS}) +set(MESOS_IO_SWITCHBOARD_SRC + ${MESOS_IO_SWITCHBOARD_SRC} + io/switchboard_main.cpp + ) # THE CONTAINERIZER EXECUTABLE. ############################### add_executable(${MESOS_CONTAINERIZER} ${CONTAINERIZER_EXECUTABLE_SRC}) +add_executable(${MESOS_IO_SWITCHBOARD} ${MESOS_IO_SWITCHBOARD_SRC}) # ADD LINKER FLAGS (generates, e.g., -lglog on Linux). ###################################################### -target_link_libraries(${MESOS_CONTAINERIZER} ${AGENT_LIBS} ${MESOS_LIBS_TARGET}) +target_link_libraries(${MESOS_CONTAINERIZER} ${AGENT_LIBS} ${MESOS_LIBS_TARGET}) +target_link_libraries(${MESOS_IO_SWITCHBOARD} ${AGENT_LIBS} ${MESOS_LIBS_TARGET}) # ADD BINARY DEPENDENCIES (tells CMake what to compile/build first). #################################################################### -add_dependencies(${MESOS_TARGET} ${MESOS_CONTAINERIZER}) -add_dependencies(${MESOS_CONTAINERIZER} ${MESOS_LIBS_TARGET}) +add_dependencies( + ${MESOS_TARGET} + ${MESOS_CONTAINERIZER} + ${MESOS_IO_SWITCHBOARD}) + +add_dependencies(${MESOS_CONTAINERIZER} ${MESOS_LIBS_TARGET}) +add_dependencies(${MESOS_IO_SWITCHBOARD} ${MESOS_LIBS_TARGET}) http://git-wip-us.apache.org/repos/asf/mesos/blob/071ed522/src/tests/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 8aca362..2ce9d37 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -162,10 +162,11 @@ set(MESOS_TESTS_SRC containerizer/docker_containerizer_tests.cpp containerizer/docker_spec_tests.cpp containerizer/docker_tests.cpp + containerizer/io_switchboard_tests.cpp containerizer/isolator_tests.cpp containerizer/memory_isolator_tests.cpp - containerizer/mesos_containerizer_tests.cpp containerizer/mesos_containerizer_paths_tests.cpp + containerizer/mesos_containerizer_tests.cpp containerizer/posix_rlimits_isolator_tests.cpp containerizer/provisioner_appc_tests.cpp containerizer/provisioner_backend_tests.cpp
