Repository: mesos Updated Branches: refs/heads/master b022d08c3 -> 2bbcca961
Windows: Added Libprocess to build. Review: https://reviews.apache.org/r/46424/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2bbcca96 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2bbcca96 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2bbcca96 Branch: refs/heads/master Commit: 2bbcca96110082c7d183345c221aec7baf5fcf94 Parents: dd5157c Author: Alex Clemmer <clemmer.alexan...@gmail.com> Authored: Mon May 23 17:56:27 2016 -0700 Committer: Joris Van Remoortere <joris.van.remoort...@gmail.com> Committed: Mon May 23 21:26:58 2016 -0700 ---------------------------------------------------------------------- 3rdparty/libprocess/CMakeLists.txt | 10 ++-------- 3rdparty/libprocess/src/tests/CMakeLists.txt | 21 ++++++++++++++------- 2 files changed, 16 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/2bbcca96/3rdparty/libprocess/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/CMakeLists.txt b/3rdparty/libprocess/CMakeLists.txt index 9f85aed..6312e20 100755 --- a/3rdparty/libprocess/CMakeLists.txt +++ b/3rdparty/libprocess/CMakeLists.txt @@ -17,14 +17,8 @@ include(ProcessTestsConfigure) # BUILD THE PROCESS LIBRARY. ############################ -if (NOT WIN32) - # TODO(hausdorff): add support for building the process library properly. - add_subdirectory(src) -endif (NOT WIN32) +add_subdirectory(src) # PROCESS TESTING INFRASTRUCTURE. ################################# -if (NOT WIN32) - # TODO(hausdorff): add support for building the process lib tests properly. - add_subdirectory(src/tests) -endif (NOT WIN32) \ No newline at end of file +add_subdirectory(src/tests) http://git-wip-us.apache.org/repos/asf/mesos/blob/2bbcca96/3rdparty/libprocess/src/tests/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/CMakeLists.txt b/3rdparty/libprocess/src/tests/CMakeLists.txt index 9558adf..0c659dc 100644 --- a/3rdparty/libprocess/src/tests/CMakeLists.txt +++ b/3rdparty/libprocess/src/tests/CMakeLists.txt @@ -18,21 +18,15 @@ ################ set(PROCESS_TESTS_SRC ${PROCESS_TESTS_SRC} + main.cpp collect_tests.cpp decoder_tests.cpp encoder_tests.cpp future_tests.cpp - http_tests.cpp - io_tests.cpp limiter_tests.cpp - main.cpp mutex_tests.cpp - metrics_tests.cpp owned_tests.cpp - process_tests.cpp queue_tests.cpp - reap_tests.cpp - sequence_tests.cpp shared_tests.cpp statistics_tests.cpp subprocess_tests.cpp @@ -41,6 +35,19 @@ set(PROCESS_TESTS_SRC time_tests.cpp ) +if (NOT WIN32) + set(PROCESS_TESTS_SRC + ${PROCESS_TESTS_SRC} + http_tests.cpp + io_tests.cpp + metrics_tests.cpp + process_tests.cpp + reap_tests.cpp + sequence_tests.cpp + ) +endif (NOT WIN32) + + # INCLUDE DIRECTIVES FOR PROCESS TEST BINARY (generates, e.g., -I/path/to/thing # on Linux). ###############################################################################
