commit fdf0198103fddf9cd43955da5eee9dc4c02ef9b4
author Marco Molteni <marco.molteni@laposte.net> Wed Apr 15 21:22:41 2015 +0200
committer Roger Meier <roger@apache.org> Wed Apr 15 22:04:49 2015 +0200
tree 15eebdf541160235cb345e8e113f88c19e0c880a
parent 7f47792bf288c3dca049d04de06d57d2f060abba

THRIFT-3097 cmake targets unconditionally depend on optional libraries Consider also cases of missing ZLIB and missing OpenSSL.

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f19f999..386a63d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,10 +75,10 @@
 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()