From 70979b7543a4aa2bb8ddce693963852c47881f09 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 11 Jul 2019 19:31:47 +0800 Subject: [PATCH] cmake: do not always build brotli or zstd these two libraries are relatively stable, and Ceph developers are not likely to hack them. so no need to rebuild them every time. Signed-off-by: Kefu Chai --- src/compressor/brotli/CMakeLists.txt | 6 ------ src/compressor/zstd/CMakeLists.txt | 7 ------- 2 files changed, 13 deletions(-) diff --git a/src/compressor/brotli/CMakeLists.txt b/src/compressor/brotli/CMakeLists.txt index f19924288f31..8b9a0f70c7ca 100644 --- a/src/compressor/brotli/CMakeLists.txt +++ b/src/compressor/brotli/CMakeLists.txt @@ -16,12 +16,6 @@ ExternalProject_Add(brotli_ext BUILD_IN_SOURCE 1 INSTALL_COMMAND "") -ExternalProject_Add_Step(brotli_ext forcebuild - DEPENDEES configure - DEPENDERS build - COMMAND "true" - ALWAYS 1) - set(bortli_libs enc dec common) file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/src/brotli/c/include") foreach(lib ${bortli_libs}) diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt index ad2689777ce9..a5ebdaf53810 100644 --- a/src/compressor/zstd/CMakeLists.txt +++ b/src/compressor/zstd/CMakeLists.txt @@ -17,13 +17,6 @@ ExternalProject_Add(zstd_ext BUILD_BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/libzstd/lib/libzstd.a" INSTALL_COMMAND "true") -# force zstd make to be called on each time -ExternalProject_Add_Step(zstd_ext forcebuild - DEPENDEES configure - DEPENDERS build - COMMAND "true" - ALWAYS 1) - add_library(zstd STATIC IMPORTED) set_target_properties(zstd PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/zstd/lib" -- 2.47.3