From 7c3a3cebb542c0df1fbf68acb989d869b64726f1 Mon Sep 17 00:00:00 2001 From: Azat Khuzhin Date: Mon, 17 Jan 2022 21:45:54 +0300 Subject: [PATCH] Remove unbundled double-conversion support --- CMakeLists.txt | 1 - cmake/Modules/Finddouble-conversion.cmake | 44 ------------------- cmake/print_include_directories.cmake | 4 +- contrib/CMakeLists.txt | 7 +-- contrib/arrow-cmake/CMakeLists.txt | 2 +- .../double-conversion-cmake/CMakeLists.txt | 6 ++- src/CMakeLists.txt | 4 +- 7 files changed, 10 insertions(+), 58 deletions(-) delete mode 100644 cmake/Modules/Finddouble-conversion.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 5dcf6868549..4c899521235 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -488,7 +488,6 @@ message (STATUS include (GNUInstallDirs) include (cmake/contrib_finder.cmake) -find_contrib_lib(double-conversion) # Must be before parquet include (cmake/find/icu.cmake) include (cmake/find/xz.cmake) include (cmake/find/ltdl.cmake) # for odbc diff --git a/cmake/Modules/Finddouble-conversion.cmake b/cmake/Modules/Finddouble-conversion.cmake deleted file mode 100644 index cb01be0f25b..00000000000 --- a/cmake/Modules/Finddouble-conversion.cmake +++ /dev/null @@ -1,44 +0,0 @@ -# - Try to find double-conversion headers and libraries. -# -# Usage of this module as follows: -# -# find_package(double-conversion) -# -# Variables used by this module, they can change the default behaviour and need -# to be set before calling find_package: -# -# DOUBLE_CONVERSION_ROOT_DIR Set this variable to the root installation of -# double-conversion if the module has problems finding -# the proper installation path. -# -# Variables defined by this module: -# -# DOUBLE_CONVERSION_FOUND System has double-conversion libs/headers -# DOUBLE_CONVERSION_LIBRARIES The double-conversion library/libraries -# DOUBLE_CONVERSION_INCLUDE_DIR The location of double-conversion headers - -find_path(DOUBLE_CONVERSION_ROOT_DIR - NAMES include/double-conversion/double-conversion.h -) - -find_library(DOUBLE_CONVERSION_LIBRARIES - NAMES double-conversion - PATHS ${DOUBLE_CONVERSION_ROOT_DIR}/lib ${BTRIE_CITYHASH_PATHS} -) - -find_path(DOUBLE_CONVERSION_INCLUDE_DIR - NAMES double-conversion/double-conversion.h - PATHS ${DOUBLE_CONVERSION_ROOT_DIR}/include ${DOUBLE_CONVERSION_INCLUDE_PATHS} -) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(double_conversion DEFAULT_MSG - DOUBLE_CONVERSION_LIBRARIES - DOUBLE_CONVERSION_INCLUDE_DIR -) - -mark_as_advanced( - DOUBLE_CONVERSION_ROOT_DIR - DOUBLE_CONVERSION_LIBRARIES - DOUBLE_CONVERSION_INCLUDE_DIR -) diff --git a/cmake/print_include_directories.cmake b/cmake/print_include_directories.cmake index cc2098cb397..7871d375fcc 100644 --- a/cmake/print_include_directories.cmake +++ b/cmake/print_include_directories.cmake @@ -16,8 +16,8 @@ list(APPEND dirs ${dirs1}) get_property (dirs1 TARGET roaring PROPERTY INCLUDE_DIRECTORIES) list(APPEND dirs ${dirs1}) -if (TARGET double-conversion) - get_property (dirs1 TARGET double-conversion PROPERTY INCLUDE_DIRECTORIES) +if (TARGET ch_contrib::double_conversion) + get_property (dirs1 TARGET ch_contrib::double_conversion PROPERTY INCLUDE_DIRECTORIES) list(APPEND dirs ${dirs1}) endif () diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 7b0aaf088d4..cd95431e505 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -50,6 +50,7 @@ if (USE_INTERNAL_XZ_LIBRARY) add_subdirectory (xz-cmake) endif() +add_subdirectory (double-conversion-cmake) add_subdirectory (boringssl-cmake) add_subdirectory (poco-cmake) add_subdirectory (croaring-cmake) @@ -60,7 +61,7 @@ add_subdirectory (snappy-cmake) add_subdirectory (rocksdb-cmake) add_subdirectory (thrift-cmake) # parquet/arrow/orc -add_subdirectory (arrow-cmake) # requires: snappy, thrift +add_subdirectory (arrow-cmake) # requires: snappy, thrift, double-conversion add_subdirectory (avro-cmake) # requires: snappy add_subdirectory (hive-metastore-cmake) # requires: thrift/avro/arrow add_subdirectory (librdkafka-cmake) @@ -80,10 +81,6 @@ if (USE_INTERNAL_RE2_LIBRARY) add_subdirectory (re2-cmake) endif () -if (USE_INTERNAL_DOUBLE_CONVERSION_LIBRARY) - add_subdirectory (double-conversion-cmake) -endif () - if (USE_INTERNAL_CITYHASH_LIBRARY) add_subdirectory (cityhash102) endif () diff --git a/contrib/arrow-cmake/CMakeLists.txt b/contrib/arrow-cmake/CMakeLists.txt index 5738b4a53ea..5e500877f3c 100644 --- a/contrib/arrow-cmake/CMakeLists.txt +++ b/contrib/arrow-cmake/CMakeLists.txt @@ -365,7 +365,7 @@ add_dependencies(_arrow protoc) target_include_directories(_arrow SYSTEM BEFORE PUBLIC ${ARROW_SRC_DIR}) target_include_directories(_arrow SYSTEM BEFORE PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/cpp/src") -target_link_libraries(_arrow PRIVATE ${DOUBLE_CONVERSION_LIBRARIES}) +target_link_libraries(_arrow PRIVATE ch_contrib::double_conversion) target_link_libraries(_arrow PRIVATE ch_contrib::protobuf) target_link_libraries(_arrow PRIVATE ch_contrib::lz4) target_link_libraries(_arrow PRIVATE ch_contrib::snappy) diff --git a/contrib/double-conversion-cmake/CMakeLists.txt b/contrib/double-conversion-cmake/CMakeLists.txt index c8bf1b34b8f..dc5b1719abf 100644 --- a/contrib/double-conversion-cmake/CMakeLists.txt +++ b/contrib/double-conversion-cmake/CMakeLists.txt @@ -1,6 +1,6 @@ SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/double-conversion") -add_library(double-conversion +add_library(_double-conversion "${LIBRARY_DIR}/double-conversion/bignum.cc" "${LIBRARY_DIR}/double-conversion/bignum-dtoa.cc" "${LIBRARY_DIR}/double-conversion/cached-powers.cc" @@ -10,4 +10,6 @@ add_library(double-conversion "${LIBRARY_DIR}/double-conversion/fixed-dtoa.cc" "${LIBRARY_DIR}/double-conversion/strtod.cc") -target_include_directories(double-conversion SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}") +target_include_directories(_double-conversion SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}") + +add_library(ch_contrib::double_conversion ALIAS _double-conversion) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index edf1809c49d..0236f6074d5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -303,7 +303,7 @@ target_link_libraries (clickhouse_common_io ${LINK_LIBRARIES_ONLY_ON_X86_64} PUBLIC common - ${DOUBLE_CONVERSION_LIBRARIES} + ch_contrib::double_conversion dragonbox_to_chars ) @@ -481,8 +481,6 @@ if (USE_CASSANDRA) dbms_target_include_directories (SYSTEM BEFORE PUBLIC ${CASS_INCLUDE_DIR}) endif() -target_include_directories (clickhouse_common_io SYSTEM BEFORE PUBLIC ${DOUBLE_CONVERSION_INCLUDE_DIR}) - if (USE_MSGPACK) target_include_directories (clickhouse_common_io SYSTEM BEFORE PUBLIC ${MSGPACK_INCLUDE_DIR}) endif()