Skip to content

Commit 519b2a8

Browse files
committed
Add ccache, cmake has been modified
1 parent b5b40f5 commit 519b2a8

File tree

15 files changed

+20
-23
lines changed

15 files changed

+20
-23
lines changed

.github/workflows/kiwidb.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ jobs:
6767
run: |
6868
export LIBRARY_PATH=$(xcrun --show-sdk-path)/usr/lib
6969
export DYLD_LIBRARY_PATH=$(xcrun --show-sdk-path)/usr/lib
70-
bash ./etc/script/build.sh --clear
7170
bash ./etc/script/build.sh --ninja --verbose
7271
7372
- name: GTest
@@ -115,7 +114,6 @@ jobs:
115114
116115
- name: Build
117116
run: |
118-
bash ./etc/script/build.sh --clear
119117
bash ./etc/script/build.sh --ninja --verbose
120118
121119
- name: GTest

cmake/braft.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ExternalProject_Add(
2525
GIT_SHALLOW true
2626
SOURCE_DIR ${BRAFT_SOURCES_DIR}
2727
GIT_SHALLOW true
28-
UPDATE_DISCONNECTED 1
28+
UPDATE_COMMAND ""
2929
CMAKE_ARGS
3030
${EXTERNAL_PROJECT_C}
3131
${EXTERNAL_PROJECT_CXX}

cmake/brpc.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ExternalProject_Add(
2424
DOWNLOAD_NAME "brpc-1.8.0.tar.gz"
2525
SOURCE_DIR ${BRPC_SOURCES_DIR}
2626
GIT_SHALLOW true
27-
UPDATE_DISCONNECTED 1
27+
UPDATE_COMMAND ""
2828
CMAKE_ARGS
2929
${EXTERNAL_PROJECT_C}
3030
${EXTERNAL_PROJECT_CXX}

cmake/findTools.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@ ELSE ()
4747
MESSAGE(STATUS "found clang-apply-replacements at ${CLANG_APPLY_REPLACEMENTS_BIN}")
4848
ENDIF ()
4949

50+
# Configure CCache if available
51+
find_program(CCACHE_FOUND ccache)
52+
if(CCACHE_FOUND)
53+
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
54+
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
55+
endif(CCACHE_FOUND)
56+
5057
OPTION(WITH_COMMAND_DOCS "build with command docs support" OFF)
5158
IF (WITH_COMMAND_DOCS)
5259
ADD_DEFINITIONS(-DWITH_COMMAND_DOCS)

cmake/fmt.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ 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-
UPDATE_DISCONNECTED 1
25+
UPDATE_COMMAND ""
2626
CMAKE_ARGS
2727
${EXTERNAL_PROJECT_C}
2828
${EXTERNAL_PROJECT_CXX}
@@ -37,5 +37,4 @@ ExternalProject_Add(
3737
${EXTERNAL_GENERATOR}
3838
BUILD_BYPRODUCTS ${FMT_LIBRARIES}
3939
BUILD_COMMAND ${EXTERNAL_BUILD} -j${CPU_CORE}
40-
UPDATE_COMMAND ""
4140
)

cmake/gflags.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ 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-
UPDATE_DISCONNECTED 1
25+
UPDATE_COMMAND ""
2626
CMAKE_ARGS
2727
${EXTERNAL_GENERATOR}
2828
${EXTERNAL_PROJECT_C}
@@ -40,6 +40,5 @@ ExternalProject_Add(
4040
-DGFLAGS_BUILD_TESTING=OFF
4141
-DCMAKE_INSTALL_PREFIX=${LIB_INSTALL_PREFIX}
4242
BUILD_COMMAND ${EXTERNAL_BUILD} -j${CPU_CORE}
43-
UPDATE_COMMAND ""
4443
BUILD_BYPRODUCTS ${GFLAGS_LIBRARY}
4544
)

cmake/gtest.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ExternalProject_Add(
1616
GIT_SHALLOW true
1717
SOURCE_DIR ${GTEST_SOURCES_DIR}
1818
GIT_SHALLOW true
19-
UPDATE_DISCONNECTED 1
19+
UPDATE_COMMAND ""
2020
CMAKE_ARGS
2121
${EXTERNAL_GENERATOR}
2222
-DCMAKE_INSTALL_PREFIX=${LIB_INSTALL_PREFIX}

cmake/leveldb.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ExternalProject_Add(
1616
GIT_TAG "1.23"
1717
SOURCE_DIR ${LEVELDB_SOURCES_DIR}
1818
GIT_SHALLOW true
19-
UPDATE_DISCONNECTED 1
19+
UPDATE_COMMAND ""
2020
CMAKE_ARGS
2121
${EXTERNAL_PROJECT_C}
2222
${EXTERNAL_PROJECT_CXX}
@@ -34,6 +34,5 @@ ExternalProject_Add(
3434
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
3535
${EXTERNAL_GENERATOR}
3636
BUILD_COMMAND ${EXTERNAL_BUILD} -j${CPU_CORE}
37-
UPDATE_COMMAND ""
3837
BUILD_BYPRODUCTS ${LEVELDB_LIBRARIES}
3938
)

cmake/lz4.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ExternalProject_Add(
1717
DOWNLOAD_NO_PROGRESS 1
1818
${EXTERNAL_PROJECT_LOG_ARGS}
1919
SOURCE_SUBDIR build/cmake
20-
UPDATE_DISCONNECTED 1
20+
UPDATE_COMMAND ""
2121
CMAKE_ARGS
2222
${EXTERNAL_PROJECT_C}
2323
${EXTERNAL_PROJECT_CXX}
@@ -31,6 +31,5 @@ ExternalProject_Add(
3131
-DBUILD_SHARED_LIBS=OFF
3232
${EXTERNAL_GENERATOR}
3333
BUILD_COMMAND ${EXTERNAL_BUILD} -j${CPU_CORE}
34-
UPDATE_COMMAND ""
3534
BUILD_BYPRODUCTS ${LZ4_LIBRARIES}
3635
)

cmake/protobuf.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ SET(PROTOBUF_PROTOC "${LIB_INSTALL_PREFIX}/bin/protoc")
2121

2222
ExternalProject_Add(
2323
protobuf
24-
UPDATE_COMMAND ""
2524
LOG_CONFIGURE 1
2625
LOG_BUILD 1
2726
LOG_INSTALL 1
@@ -33,7 +32,7 @@ ExternalProject_Add(
3332
DOWNLOAD_NAME "protobuf-3.18.0.tar.gz"
3433
SOURCE_DIR ${PROTOBUF_SOURCES_DIR}
3534
DOWNLOAD_NO_PROGRESS 1
36-
UPDATE_DISCONNECTED 1
35+
UPDATE_COMMAND ""
3736
CMAKE_ARGS
3837
${EXTERNAL_PROJECT_C}
3938
${EXTERNAL_PROJECT_CXX}

0 commit comments

Comments
 (0)