Removed useless file; preparations #2791

CMakeLists.txt

@@ -162,7 +162,7 @@ set (CMAKE_C_FLAGS_DEBUG                 "${CMAKE_C_FLAGS_DEBUG} -O0 -g3 -ggdb3
 
 if (MAKE_STATIC_LIBRARIES AND NOT APPLE AND NOT (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND ARCH_FREEBSD))
     set (CMAKE_EXE_LINKER_FLAGS          "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
-    
+
     # Along with executables, we also build example of shared library for "library dictionary source"; and it also should be self-contained.
     set (CMAKE_SHARED_LINKER_FLAGS       "${CMAKE_SHARED_LINKER_FLAGS} -static-libgcc -static-libstdc++")
 endif ()
@@ -281,7 +281,6 @@ include (cmake/find_contrib_lib.cmake)
 find_contrib_lib(cityhash)
 find_contrib_lib(farmhash)
 find_contrib_lib(metrohash)
-find_contrib_lib(murmurhash2)
 find_contrib_lib(btrie)
 find_contrib_lib(double-conversion)
 

cmake/Modules/Findmurmurhash2.cmake

-# - Try to find murmurhash2 headers and libraries.
-#
-# Usage of this module as follows:
-#
-#     find_package(murmurhash2)
-#
-# Variables used by this module, they can change the default behaviour and need
-# to be set before calling find_package:
-#
-#  MURMURHASH2_ROOT_DIR Set this variable to the root installation of
-#                    murmurhash2 if the module has problems finding
-#                    the proper installation path.
-#
-# Variables defined by this module:
-#
-#  MURMURHASH2_FOUND             System has murmurhash2 libs/headers
-#  MURMURHASH2_LIBRARIES         The murmurhash2 library/libraries
-#  MURMURHASH2_INCLUDE_DIR       The location of murmurhash2 headers
-
-find_path(MURMURHASH2_ROOT_DIR
-    NAMES include/murmurhash2.h
-)
-
-find_library(MURMURHASH2_LIBRARIES
-    NAMES murmurhash2
-    PATHS ${MURMURHASH2_ROOT_DIR}/lib ${MURMURHASH2_LIBRARIES_PATHS}
-)
-
-find_path(MURMURHASH2_INCLUDE_DIR
-    NAMES murmurhash2.h
-    PATHS ${MURMURHASH2_ROOT_DIR}/include ${MURMURHASH2_INCLUDE_PATHS}
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(murmurhash2 DEFAULT_MSG
-    MURMURHASH2_LIBRARIES
-    MURMURHASH2_INCLUDE_DIR
-)
-
-mark_as_advanced(
-    MURMURHASH2_ROOT_DIR
-    MURMURHASH2_LIBRARIES
-    MURMURHASH2_INCLUDE_DIR
-)

contrib/CMakeLists.txt

@@ -43,6 +43,8 @@ if (USE_INTERNAL_METROHASH_LIBRARY)
     add_subdirectory (libmetrohash)
 endif ()
 
+add_subdirectory (murmurhash)
+
 if (USE_INTERNAL_BTRIE_LIBRARY)
     add_subdirectory (libbtrie)
 endif ()
@@ -51,10 +53,6 @@ if (USE_INTERNAL_UNWIND_LIBRARY)
     add_subdirectory (libunwind)
 endif ()
 
-if (USE_INTERNAL_MURMURHASH2_LIBRARY)
-    add_subdirectory (murmurhash2)
-endif ()
-
 if (USE_INTERNAL_ZLIB_LIBRARY)
     add_subdirectory (${INTERNAL_ZLIB_NAME})
     # todo: make pull to Dead2/zlib-ng and remove:

contrib/murmurhash2/CMakeLists.txt → contrib/murmurhash/CMakeLists.txt

-add_library(murmurhash2
+add_library(murmurhash
     src/murmurhash2.cpp
     include/murmurhash2.h)
 
-target_include_directories (murmurhash2 PUBLIC include)
+target_include_directories (murmurhash PUBLIC include)

contrib/murmurhash/LICENSE

+MurmurHash was written by Austin Appleby, and is placed in the publicdomain. The author hereby disclaims copyright to this source code.

contrib/murmurhash2/LICENSE

-MurmurHash2 was written by Austin Appleby, and is placed in the publicdomain. The author hereby disclaims copyright to this source code.

dbms/src/Functions/CMakeLists.txt

@@ -41,7 +41,7 @@ generate_function_register(Array
     FunctionArrayEnumerate
     FunctionArrayEnumerateUniq
     FunctionArrayUniq
-    FunctionArrayDistinct	
+    FunctionArrayDistinct
     FunctionEmptyArrayUInt8
     FunctionEmptyArrayUInt16
     FunctionEmptyArrayUInt32
@@ -91,7 +91,7 @@ list(REMOVE_ITEM clickhouse_functions_headers IFunction.h FunctionFactory.h Func
 
 add_library(clickhouse_functions ${clickhouse_functions_sources})
 
-target_link_libraries(clickhouse_functions PUBLIC dbms PRIVATE libconsistent-hashing ${FARMHASH_LIBRARIES} ${METROHASH_LIBRARIES} ${MURMURHASH2_LIBRARIES})
+target_link_libraries(clickhouse_functions PUBLIC dbms PRIVATE libconsistent-hashing ${FARMHASH_LIBRARIES} ${METROHASH_LIBRARIES} murmurhash)
 
 target_include_directories (clickhouse_functions SYSTEM BEFORE PUBLIC ${DIVIDE_INCLUDE_DIR})