Repository: thrift Updated Branches: refs/heads/master a242c28ba -> fdf019810
THRIFT-3097 cmake targets unconditionally depend on optional libraries Consider also cases of missing ZLIB and missing OpenSSL. Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/fdf01981 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/fdf01981 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/fdf01981 Branch: refs/heads/master Commit: fdf0198103fddf9cd43955da5eee9dc4c02ef9b4 Parents: 7f47792 Author: Marco Molteni <[email protected]> Authored: Wed Apr 15 21:22:41 2015 +0200 Committer: Roger Meier <[email protected]> Committed: Wed Apr 15 22:04:49 2015 +0200 ---------------------------------------------------------------------- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/fdf01981/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index f19f999..386a63d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,10 +75,10 @@ endif() if(WITH_CPP) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lib/cpp) if(BUILD_TESTING) - if(WITH_LIBEVENT) + if(WITH_LIBEVENT AND WITH_ZLIB AND WITH_OPENSSL) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/test/cpp) else() - message(WARNING "libevent not found or disabled; will not build some tests") + message(WARNING "libevent and/or ZLIB and/or OpenSSL not found or disabled; will not build some tests") endif() endif() endif()
