THRIFT-3663 CMake cpp test fails to build on system without zlib Client: Build (C++) Patch: Nobuaki Sukegawa
This closes #890 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/3e5b9c27 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/3e5b9c27 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/3e5b9c27 Branch: refs/heads/master Commit: 3e5b9c275e9f88cefc05c0e0d6da6e86c46ba88d Parents: dd2223c Author: Nobuaki Sukegawa <ns...@apache.org> Authored: Mon Feb 22 21:47:23 2016 +0900 Committer: Nobuaki Sukegawa <ns...@apache.org> Committed: Mon Feb 22 23:27:01 2016 +0900 ---------------------------------------------------------------------- lib/cpp/test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/3e5b9c27/lib/cpp/test/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/lib/cpp/test/CMakeLists.txt b/lib/cpp/test/CMakeLists.txt index 7fb2aa3..7c7e320 100644 --- a/lib/cpp/test/CMakeLists.txt +++ b/lib/cpp/test/CMakeLists.txt @@ -21,7 +21,6 @@ set(Boost_USE_STATIC_LIBS ON) # Force the use of static boost test framework find_package(Boost 1.53.0 REQUIRED COMPONENTS chrono filesystem system thread unit_test_framework) include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") -include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}") if (WITH_DYN_LINK_TEST) add_definitions( -DBOOST_TEST_DYN_LINK ) @@ -127,6 +126,7 @@ endif () add_test(NAME TServerIntegrationTest COMMAND TServerIntegrationTest) if(WITH_ZLIB) +include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}") add_executable(TransportTest TransportTest.cpp) target_link_libraries(TransportTest testgencpp
