RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 17:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28984 from tchaikov/wip-cmake-rebuild-cleanup

Browse Source 
cmake: use BUILD_ALWAYS for rebuilding external project

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Kefu Chai 2019-07-12 14:54:30 +08:00 committed by GitHub
commit fcfc33b412
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/modules/BuildRocksDB.cmake
View File

@ -65,14 +65,9 @@ function(build_rocksdb)
CMAKE_ARGS ${rocksdb_CMAKE_ARGS}
BINARY_DIR "${rocksdb_BINARY_DIR}"
BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target rocksdb
BUILD_ALWAYS TRUE
BUILD_BYPRODUCTS "${rocksdb_LIBRARY}"
INSTALL_COMMAND "true")
# force rocksdb make to be called on each time
ExternalProject_Add_Step(rocksdb_ext forcebuild
DEPENDEES configure
DEPENDERS build
COMMAND "true"
ALWAYS 1)
add_library(RocksDB::RocksDB STATIC IMPORTED)
add_dependencies(RocksDB::RocksDB rocksdb_ext)

6
src/compressor/brotli/CMakeLists.txt
View File

@ -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})

7
src/compressor/zstd/CMakeLists.txt
View File

@ -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"