CMake:[2/2] Removed `__WINDOWS__` flag definition from Stout config. Review: https://reviews.apache.org/r/39097
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ad0ce07d Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ad0ce07d Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ad0ce07d Branch: refs/heads/master Commit: ad0ce07d834b19299eda5551625782e8662b4539 Parents: ddc29a9 Author: Alex Clemmer <[email protected]> Authored: Wed Oct 14 14:13:18 2015 +0200 Committer: Joris Van Remoortere <[email protected]> Committed: Wed Oct 14 14:30:02 2015 +0200 ---------------------------------------------------------------------- .../3rdparty/stout/cmake/StoutTestsConfigure.cmake | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ad0ce07d/3rdparty/libprocess/3rdparty/stout/cmake/StoutTestsConfigure.cmake ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/cmake/StoutTestsConfigure.cmake b/3rdparty/libprocess/3rdparty/stout/cmake/StoutTestsConfigure.cmake index acc6e02..9893d74 100644 --- a/3rdparty/libprocess/3rdparty/stout/cmake/StoutTestsConfigure.cmake +++ b/3rdparty/libprocess/3rdparty/stout/cmake/StoutTestsConfigure.cmake @@ -33,18 +33,10 @@ endif (NOT WIN32) # COMPILER CONFIGURATION. ######################### -if (WIN32) - # Used to #ifdef out (e.g.) some platform-specific parts of Stout. We choose - # to define a new flag rather than using an existing flag (e.g., `_WIN32`) - # because we want to give the build system fine-grained control over how what - # code is #ifdef'd out in the future, and using only flags defined by our - # build system to control this logic is the clearest and stablest way of - # doing this. - add_definitions(-D__WINDOWS__) -elseif (APPLE) +if (APPLE) # GTEST on OSX needs its own tr1 tuple. add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=1 -DGTEST_LANG_CXX11) -endif (WIN32) +endif (APPLE) # DEFINE PROCESS LIBRARY DEPENDENCIES. Tells the process library build targets # download/configure/build all third-party libraries before attempting to build.
