diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index 5e489d03f5..f6fd11d4ba 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -152,7 +152,7 @@ ExternalProject_Add(thrift -DWITH_LIBEVENT=OFF -DCMAKE_INSTALL_PREFIX=${TP_OUTPUT} -DCMAKE_POSITION_INDEPENDENT_CODE=ON - -DWITH_SHARED_LIB=ON + -DWITH_SHARED_LIB=OFF -DBOOST_ROOT=${TP_OUTPUT} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} @@ -164,12 +164,18 @@ if (COMPILER_SUPPORTS_FORMAT_OVERFLOW) set(ZOOKEEPER_CFLAGS -Wno-error=format-overflow) endif () +if (NOT APPLE) + set(ZOOKEEPER_WITH_CYRUS_SASL ${TP_OUTPUT}) +else () + set(ZOOKEEPER_WITH_CYRUS_SASL /usr/local/opt/cyrus-sasl/lib) +endif () + ExternalProject_Add(zookeeper URL ${OSS_URL_PREFIX}/apache-zookeeper-3.7.0.tar.gz http://downloads.apache.org/zookeeper/zookeeper-3.7.0/apache-zookeeper-3.7.0.tar.gz URL_MD5 44c2a33e01931aed94ef7f3d39d0963e PATCH_COMMAND "" - COMMAND cd zookeeper-jute && mvn compile && cd ../zookeeper-client/zookeeper-client-c && cmake -DCMAKE_BUILD_TYPE=release -DWANT_CPPUNIT=OFF -DWITH_OPENSSL=OFF -DWITH_CYRUS_SASL=ON -DCMAKE_INSTALL_PREFIX=${TP_OUTPUT} + COMMAND cd zookeeper-jute && mvn compile && cd ../zookeeper-client/zookeeper-client-c && cmake -DCMAKE_BUILD_TYPE=release -DWANT_CPPUNIT=OFF -DWITH_OPENSSL=OFF -DWITH_CYRUS_SASL=${ZOOKEEPER_WITH_CYRUS_SASL} -DCMAKE_INSTALL_PREFIX=${TP_OUTPUT} COMMAND cd zookeeper-client/zookeeper-client-c && make COMMAND cp -R zookeeper-client/zookeeper-client-c/include/. ${TP_OUTPUT}/include/zookeeper && cp zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h ${TP_OUTPUT}/include/zookeeper && cp zookeeper-client/zookeeper-client-c/libzookeeper.a ${TP_OUTPUT}/lib && cp zookeeper-client/zookeeper-client-c/libhashtable.a ${TP_OUTPUT}/lib CONFIGURE_COMMAND "" @@ -381,7 +387,6 @@ ExternalProject_Add(rocksdb -DWITH_BZ2=OFF -DWITH_TESTS=OFF -DWITH_GFLAGS=OFF - -DWITH_OPENSSL=ON -DUSE_RTTI=ON -DWITH_OPENSSL=ON # enable encryption -DCMAKE_BUILD_TYPE=Release