Merge branch 'master' of github.com:yandex/ClickHouse

contrib/libtcmalloc/CMakeLists.txt

@@ -8,7 +8,6 @@ add_definitions(
     -Wno-deprecated-declarations
     -Wno-unused-function
     -Wno-unused-private-field
-    -Wno-dynamic-exception-spec
     -fno-builtin-malloc
     -fno-builtin-free
     -fno-builtin-realloc
@@ -20,12 +19,16 @@ add_definitions(
     -fno-builtin-pvalloc
 )
 
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.9)
+    add_definitions( -Wno-dynamic-exception-spec )
+endif()
+
 if(CMAKE_SYSTEM MATCHES "FreeBSD" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-	add_definitions(-Wno-unused-but-set-variable)
+    add_definitions(-Wno-unused-but-set-variable)
 endif()
 
 if(CMAKE_SYSTEM MATCHES "FreeBSD")
-	add_definitions(-D_GNU_SOURCE)
+    add_definitions(-D_GNU_SOURCE)
 endif()
 
 include_directories (include src)

libs/libzkutil/CMakeLists.txt

@@ -28,3 +28,5 @@ find_package (Threads)
 target_link_libraries(zkutil ${ZOOKEEPER_LIBRARY} ${Poco_Foundation_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} string_utils)
 
 add_subdirectory (src)
+
+add_subdirectory (zookeeper-cli)

libs/libzkutil/src/tests/CMakeLists.txt

@@ -1,6 +1,3 @@
-add_executable(zkutil_test zkutil_test.cpp)
-target_link_libraries(zkutil_test zkutil dbms ${LINE_EDITING_LIBS})
-
 add_executable(zkutil_test_commands zkutil_test_commands.cpp)
 target_link_libraries(zkutil_test_commands zkutil dbms)