From 4fcb081f5b0334663aa5c503682bd30db5da1715 Mon Sep 17 00:00:00 2001 From: proller Date: Wed, 22 Nov 2017 15:15:17 +0300 Subject: [PATCH] Zlib: remove unused test targets --- cmake/find_zlib.cmake | 1 + contrib/CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/cmake/find_zlib.cmake b/cmake/find_zlib.cmake index 93e62497c25..3b41280f1c5 100644 --- a/cmake/find_zlib.cmake +++ b/cmake/find_zlib.cmake @@ -7,6 +7,7 @@ endif () if (NOT ZLIB_FOUND) set (USE_INTERNAL_ZLIB_LIBRARY 1) set (ZLIB_COMPAT 1) # for zlib-ng, also enables WITH_GZFILEOP + set (WITH_NATIVE_INSTRUCTIONS ${ARCHNATIVE}) set (ZLIB_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libzlib-ng" "${ClickHouse_BINARY_DIR}/contrib/libzlib-ng") # generated zconf.h set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR}) # for poco set (ZLIB_FOUND 1) # for poco diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 11e7e72a973..c7900f844e1 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -50,6 +50,10 @@ if (USE_INTERNAL_ZLIB_LIBRARY) # We should use same defines when including zlib.h as used when zlib compiled target_compile_definitions (zlib PUBLIC ZLIB_COMPAT WITH_GZFILEOP) target_compile_definitions (zlibstatic PUBLIC ZLIB_COMPAT WITH_GZFILEOP) + set_target_properties(example PROPERTIES EXCLUDE_FROM_ALL 1) + set_target_properties(example64 PROPERTIES EXCLUDE_FROM_ALL 1) + set_target_properties(minigzip PROPERTIES EXCLUDE_FROM_ALL 1) + set_target_properties(minigzip64 PROPERTIES EXCLUDE_FROM_ALL 1) endif () if (USE_INTERNAL_CCTZ_LIBRARY)