From: Kefu Chai <kchai@redhat.com>
Date: Thu, 11 Jul 2019 11:31:47 +0000 (+0800)
Subject: cmake: do not always build brotli or zstd
X-Git-Tag: v15.1.0~2229^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=70979b7543a4aa2bb8ddce693963852c47881f09;p=ceph.git

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 <kchai@redhat.com>
---

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"