Modernized the Stout tests CMakeLists file. Now that other people are starting to attempt to compile Stout on Windows, it's important that we give them a CMakeLists file that explicitly compiles the parts of Stout we're willing to support.
Review: https://reviews.apache.org/r/37345 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/066a5a80 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/066a5a80 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/066a5a80 Branch: refs/heads/master Commit: 066a5a8000b98199aa799c53def7ccbff76a82a6 Parents: 989eca4 Author: Alex Clemmer <[email protected]> Authored: Thu Sep 10 12:07:34 2015 -0700 Committer: Joris Van Remoortere <[email protected]> Committed: Thu Sep 10 17:15:12 2015 -0700 ---------------------------------------------------------------------- .../3rdparty/stout/tests/CMakeLists.txt | 34 ++++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/066a5a80/3rdparty/libprocess/3rdparty/stout/tests/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/CMakeLists.txt b/3rdparty/libprocess/3rdparty/stout/tests/CMakeLists.txt index b1a5190..cf5fd5c 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/CMakeLists.txt +++ b/3rdparty/libprocess/3rdparty/stout/tests/CMakeLists.txt @@ -24,41 +24,47 @@ set(STOUT_TESTS_SRC bits_tests.cpp bytes_tests.cpp cache_tests.cpp - svn_tests.cpp duration_tests.cpp - dynamiclibrary_tests.cpp error_tests.cpp - flags_tests.cpp - gzip_tests.cpp hashmap_tests.cpp hashset_tests.cpp interval_tests.cpp - ip_tests.cpp json_tests.cpp linkedhashmap_tests.cpp - mac_tests.cpp main.cpp multimap_tests.cpp none_tests.cpp option_tests.cpp - os_tests.cpp - path_tests.cpp - protobuf_tests.cpp - protobuf_tests.pb.cc protobuf_tests.pb.h protobuf_tests.proto result_tests.cpp - os/sendfile_tests.cpp - os/signals_tests.cpp set_tests.cpp some_tests.cpp strings_tests.cpp - subcommand_tests.cpp - thread_tests.cpp uuid_tests.cpp version_tests.cpp ) +if (NOT WIN32) + set(STOUT_TESTS_SRC + ${STOUT_TESTS_SRC} + dynamiclibrary_tests.cpp + flags_tests.cpp + gzip_tests.cpp + ip_tests.cpp + mac_tests.cpp + os_tests.cpp + path_tests.cpp + protobuf_tests.cpp + protobuf_tests.pb.cc + os/sendfile_tests.cpp + os/signals_tests.cpp + subcommand_tests.cpp + svn_tests.cpp + thread_tests.cpp + ) +endif (NOT WIN32) + # INCLUDE DIRECTIVES FOR STOUT TEST BINARY (generates, e.g., -I/path/to/thing # on Linux). #############################################################################
