Skip to content

Commit 9ab5278

Browse files
committed
Fix cmake issues and support ninja
1 parent 04b5c06 commit 9ab5278

15 files changed

Lines changed: 32 additions & 5 deletions

cmake/braft.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ ExternalProject_Add(
2424
GIT_TAG v1.1.2-beta20250101
2525
GIT_SHALLOW true
2626
SOURCE_DIR ${BRAFT_SOURCES_DIR}
27+
GIT_SHALLOW true
28+
UPDATE_DISCONNECTED 1
2729
CMAKE_ARGS
2830
${EXTERNAL_PROJECT_C}
2931
${EXTERNAL_PROJECT_CXX}

cmake/brpc.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ ExternalProject_Add(
2323
DOWNLOAD_DIR "${CMAKE_CURRENT_SOURCE_DIR}/download"
2424
DOWNLOAD_NAME "brpc-1.8.0.tar.gz"
2525
SOURCE_DIR ${BRPC_SOURCES_DIR}
26+
GIT_SHALLOW true
27+
UPDATE_DISCONNECTED 1
2628
CMAKE_ARGS
2729
${EXTERNAL_PROJECT_C}
2830
${EXTERNAL_PROJECT_CXX}

cmake/fmt.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ ExternalProject_Add(
2222
DOWNLOAD_DIR "${CMAKE_CURRENT_SOURCE_DIR}/download"
2323
DOWNLOAD_NAME "fmt-10.1.1.zip"
2424
SOURCE_DIR ${FMT_SOURCES_DIR}
25+
GIT_SHALLOW true
26+
UPDATE_DISCONNECTED 1
2527
CMAKE_ARGS
2628
${EXTERNAL_PROJECT_C}
2729
${EXTERNAL_PROJECT_CXX}

cmake/gflags.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ ExternalProject_Add(
2222
DOWNLOAD_DIR "${CMAKE_CURRENT_SOURCE_DIR}/download"
2323
DOWNLOAD_NAME "gflags-2.2.2.zip"
2424
SOURCE_DIR ${GFLAGS_SOURCES_DIR}
25+
GIT_SHALLOW true
26+
UPDATE_DISCONNECTED 1
2527
CMAKE_ARGS
2628
${EXTERNAL_GENERATOR}
2729
${EXTERNAL_PROJECT_C}

cmake/gtest.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ ExternalProject_Add(
1515
GIT_TAG v1.14.0
1616
GIT_SHALLOW true
1717
SOURCE_DIR ${GTEST_SOURCES_DIR}
18+
GIT_SHALLOW true
19+
UPDATE_DISCONNECTED 1
1820
CMAKE_ARGS
1921
${EXTERNAL_GENERATOR}
2022
-DCMAKE_INSTALL_PREFIX=${LIB_INSTALL_PREFIX}
@@ -25,5 +27,5 @@ ExternalProject_Add(
2527
${EXTERNAL_PROJECT_CXX_FLAGS}
2628
${EXTERNAL_PROJECT_CXX_LINK_FLAGS}
2729
BUILD_COMMAND ${EXTERNAL_BUILD} -j${CPU_CORE}
28-
BUILD_BYPRODUCTS ${GTEST_LIBRARIES}
30+
BUILD_BYPRODUCTS ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
2931
)

cmake/leveldb.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ ExternalProject_Add(
1616
GIT_TAG "1.23"
1717
GIT_SHALLOW true
1818
SOURCE_DIR ${LEVELDB_SOURCES_DIR}
19+
GIT_SHALLOW true
20+
UPDATE_DISCONNECTED 1
1921
CMAKE_ARGS
2022
${EXTERNAL_PROJECT_C}
2123
${EXTERNAL_PROJECT_CXX}

cmake/lz4.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ ExternalProject_Add(
1717
DOWNLOAD_NO_PROGRESS 1
1818
${EXTERNAL_PROJECT_LOG_ARGS}
1919
SOURCE_SUBDIR build/cmake
20+
GIT_SHALLOW true
21+
UPDATE_DISCONNECTED 1
2022
CMAKE_ARGS
2123
${EXTERNAL_PROJECT_C}
2224
${EXTERNAL_PROJECT_CXX}

cmake/protobuf.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ ExternalProject_Add(
3333
DOWNLOAD_NAME "protobuf-3.18.0.tar.gz"
3434
SOURCE_DIR ${PROTOBUF_SOURCES_DIR}
3535
DOWNLOAD_NO_PROGRESS 1
36+
GIT_SHALLOW true
37+
UPDATE_DISCONNECTED 1
3638
CMAKE_ARGS
3739
${EXTERNAL_PROJECT_C}
3840
${EXTERNAL_PROJECT_CXX}
@@ -47,5 +49,5 @@ ExternalProject_Add(
4749
-Dprotobuf_BUILD_LIBPROTOC=ON
4850
${EXTERNAL_GENERATOR}
4951
BUILD_COMMAND ${EXTERNAL_BUILD} -j${CPU_CORE}
50-
BUILD_BYPRODUCTS ${LIB_PROTOBUF}
52+
BUILD_BYPRODUCTS ${PROTOBUF_LIBRARY}
5153
)

cmake/rocksdb.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ ExternalProject_Add(
1515
GIT_TAG v9.11.1
1616
GIT_SHALLOW true
1717
SOURCE_DIR ${ROCKSDB_SOURCES_DIR}
18+
GIT_SHALLOW true
19+
UPDATE_DISCONNECTED 1
1820
CMAKE_ARGS
1921
${EXTERNAL_PROJECT_C}
2022
${EXTERNAL_PROJECT_CXX}

cmake/snappy.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ ExternalProject_Add(
1414
GIT_TAG "1.2.1"
1515
GIT_SHALLOW true
1616
SOURCE_DIR ${Snappy_SOURCES_DIR}
17+
GIT_SHALLOW true
18+
UPDATE_DISCONNECTED 1
1719
CMAKE_ARGS
1820
${EXTERNAL_PROJECT_C}
1921
${EXTERNAL_PROJECT_CXX}

0 commit comments

Comments
 (0)