add zstd and lz4 libs

Author: acelyc111

cmake_modules/BaseFunctions.cmake

@@ -326,19 +326,14 @@ function(dsn_setup_thirdparty_libs)
   find_package(fmt REQUIRED)
   set(DEFAULT_THIRDPARTY_LIBS ${THRIFT_LIB} fmt::fmt CACHE STRING "default thirdparty libs" FORCE)
 
-  # rocksdb
-  file(GLOB ROCKSDB_DEPENDS_MODULE_PATH ${THIRDPARTY_ROOT}/build/Source/rocksdb/cmake/modules)
-  if(NOT ROCKSDB_DEPENDS_MODULE_PATH)
-    message(WARNING "Cannot find RocksDB depends cmake modules path, might not find snappy, zstd, lz4")
-  endif()
-  list(APPEND CMAKE_MODULE_PATH "${ROCKSDB_DEPENDS_MODULE_PATH}")
+  # rocksdb and dependent libs
+  find_package(RocksDB REQUIRED)
   find_package(Snappy REQUIRED)
-  find_package(zstd)
-  find_package(lz4)
+  find_package(Zstd REQUIRED)
+  find_package(Lz4 REQUIRED)
   if(USE_JEMALLOC)
     find_package(Jemalloc REQUIRED)
   endif()
-  find_package(RocksDB REQUIRED)
 
   # libhdfs
   find_package(JNI REQUIRED)

cmake_modules/FindLz4.cmake

@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# - Find LZ4 (lz4.h, liblz4.a)
+# This module defines
+#  LZ4_INCLUDE_DIR, directory containing headers
+#  LZ4_STATIC_LIB, path to lz4's static library
+#  LZ4_FOUND, whether lz4 has been found
+
+find_path(LZ4_INCLUDE_DIR lz4.h
+  # make sure we don't accidentally pick up a different version
+  NO_CMAKE_SYSTEM_PATH
+  NO_SYSTEM_ENVIRONMENT_PATH)
+find_library(LZ4_STATIC_LIB liblz4.a
+  NO_CMAKE_SYSTEM_PATH
+  NO_SYSTEM_ENVIRONMENT_PATH)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Lz4 REQUIRED_VARS
+  LZ4_STATIC_LIB LZ4_INCLUDE_DIR)

cmake_modules/FindSnappy.cmake

@@ -15,10 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# - Find SNAPPY (snappy.h, libsnappy.a, libsnappy.so, and libsnappy.so.1)
+# - Find SNAPPY (snappy.h, libsnappy.a)
 # This module defines
 #  SNAPPY_INCLUDE_DIR, directory containing headers
-#  SNAPPY_SHARED_LIB, path to snappy's shared library
 #  SNAPPY_STATIC_LIB, path to snappy's static library
 #  SNAPPY_FOUND, whether snappy has been found
 

cmake_modules/FindZstd.cmake

@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# - Find ZSTD (zstd.h, libzstd.a)
+# This module defines
+#  ZSTD_INCLUDE_DIR, directory containing headers
+#  ZSTD_STATIC_LIB, path to zstd's static library
+#  ZSTD_FOUND, whether zstd has been found
+
+find_path(ZSTD_INCLUDE_DIR zstd.h
+  # make sure we don't accidentally pick up a different version
+  NO_CMAKE_SYSTEM_PATH
+  NO_SYSTEM_ENVIRONMENT_PATH)
+find_library(ZSTD_STATIC_LIB libzstd.a
+  NO_CMAKE_SYSTEM_PATH
+  NO_SYSTEM_ENVIRONMENT_PATH)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Zstd REQUIRED_VARS
+  ZSTD_STATIC_LIB ZSTD_INCLUDE_DIR)

thirdparty/CMakeLists.txt

@@ -395,14 +395,34 @@ ExternalProject_Add(zstd
         https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-1.5.5.tar.gz
         URL_MD5 63251602329a106220e0a5ad26ba656f
         PATCH_COMMAND ""
-        CMAKE_COMMAND cmake build/cmake
-        CMAKE_ARGS
+        CONFIGURE_COMMAND cmake build/cmake
         -DCMAKE_INSTALL_PREFIX=${TP_OUTPUT}
+        -DCMAKE_POSITION_INDEPENDENT_CODE=ON
         -DCMAKE_BUILD_TYPE=Release
         -DZSTD_BUILD_PROGRAMS=OFF
         -DZSTD_BUILD_TESTS=OFF
         -DZSTD_BUILD_CONTRIB=OFF
         -DZSTD_BUILD_SHARED=OFF
+        -DZSTD_BUILD_STATIC=ON
+        BUILD_COMMAND make -j${PARALLEL}
+        INSTALL_COMMAND make install
+        BUILD_IN_SOURCE 1
+        DOWNLOAD_EXTRACT_TIMESTAMP true
+        DOWNLOAD_NO_PROGRESS true
+)
+
+ExternalProject_Add(lz4
+        URL ${OSS_URL_PREFIX}/lz4-1.9.4.tar.gz
+        https://github.com/lz4/lz4/releases/download/v1.9.4/lz4-1.9.4.tar.gz
+        URL_MD5 e9286adb64040071c5e23498bf753261
+        PATCH_COMMAND ""
+        CONFIGURE_COMMAND cmake build/cmake
+        -DCMAKE_INSTALL_PREFIX=${TP_OUTPUT}
+        -DLZ4_POSITION_INDEPENDENT_LIB=ON
+        -DCMAKE_BUILD_TYPE=Release
+        -DLZ4_BUILD_CLI=OFF
+        -DBUILD_SHARED_LIBS=OFF
+        -DBUILD_STATIC_LIBS=ON
         BUILD_COMMAND make -j${PARALLEL}
         INSTALL_COMMAND make install
         BUILD_IN_SOURCE 1