Skip to content

Commit eefc55c

Browse files
author
Andrei Popescu
authored
Add shallow clone flag to ExternalProject_Add. (#1120)
Adding the GIT_SHALLOW flag to ExternalProject_Add will speed up our external dependencies cloning and avoids timeouts due to stucked or slow connections. Relates-To: OLPEDGE-2410 Signed-off-by: Andrei Popescu <[email protected]>
1 parent c5920d6 commit eefc55c

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

external/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ endif()
3535
set(COMMON_PLATFORM_FLAGS)
3636

3737
if(ANDROID)
38-
set(COMMON_PLATFORM_FLAGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
38+
set(COMMON_PLATFORM_FLAGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
3939
-DANDROID_PLATFORM=${ANDROID_PLATFORM}
4040
-DANDROID_STL=${ANDROID_STL}
4141
-DANDROID_ABI=${ANDROID_ABI})
@@ -45,7 +45,7 @@ elseif(IOS)
4545
-DSIMULATOR=${SIMULATOR})
4646
endif()
4747

48-
# Setup versions for external project
48+
# Setup versions for external project
4949
set(OLP_SDK_CPP_GOOGLETEST_URL "https://github.com/google/googletest.git")
5050
set(OLP_SDK_CPP_GOOGLETEST_TAG "release-1.10.0")
5151

external/boost/CMakeLists.txt.boost.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ include(ExternalProject)
2323

2424
ExternalProject_Add(boost-download
2525
GIT_REPOSITORY @OLP_SDK_CPP_BOOST_URL@
26-
GIT_TAG @OLP_SDK_CPP_BOOST_TAG@
26+
GIT_TAG @OLP_SDK_CPP_BOOST_TAG@
2727
GIT_SUBMODULES libs/any
2828
libs/assert
2929
libs/config
@@ -55,6 +55,7 @@ ExternalProject_Add(boost-download
5555
libs/winapi
5656
tools/build
5757
tools/boost_install
58+
GIT_SHALLOW 1
5859
SOURCE_DIR "@CMAKE_CURRENT_BINARY_DIR@/external_boost"
5960
UPDATE_COMMAND ""
6061
CONFIGURE_COMMAND cd "@CMAKE_CURRENT_BINARY_DIR@/external_boost" && @BOOTSTRAP_CMD@ && cd "@CMAKE_CURRENT_BINARY_DIR@/external_boost" && @B2_CMD@ headers

external/googletest/CMakeLists.txt.googletest.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ include(ExternalProject)
2323
ExternalProject_Add(googletest
2424
GIT_REPOSITORY @OLP_SDK_CPP_GOOGLETEST_URL@
2525
GIT_TAG @OLP_SDK_CPP_GOOGLETEST_TAG@
26+
GIT_SHALLOW 1
2627
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
2728
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
2829
CONFIGURE_COMMAND ""

external/leveldb/CMakeLists.txt.leveldb.in

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ include(ExternalProject)
2424
ExternalProject_Add(snappy
2525
GIT_REPOSITORY @OLP_SDK_CPP_SNAPPY_URL@
2626
GIT_TAG @OLP_SDK_CPP_SNAPPY_TAG@
27+
GIT_SHALLOW 1
2728
INSTALL_DIR "@EXTERNAL_BINARY_INSTALL_DIR@"
28-
CMAKE_ARGS ${CMAKE_ARGS}
29-
${COMMON_CMAKE_ARGS}
30-
-DCMAKE_INSTALL_LIBDIR=lib
29+
CMAKE_ARGS ${CMAKE_ARGS}
30+
${COMMON_CMAKE_ARGS}
31+
-DCMAKE_INSTALL_LIBDIR=lib
3132
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
3233
-DSNAPPY_BUILD_TESTS=OFF
3334
BUILD_COMMAND "${CMAKE_COMMAND}" --build . --config ${CMAKE_BUILD_TYPE} ${EXTERNAL_BUILD_FLAGS}
@@ -37,16 +38,18 @@ ExternalProject_Add(snappy
3738
ExternalProject_Add(leveldb
3839
GIT_REPOSITORY @OLP_SDK_CPP_LEVELDB_URL@
3940
GIT_TAG @OLP_SDK_CPP_LEVELDB_TAG@
41+
GIT_SHALLOW 1
4042
INSTALL_DIR "@EXTERNAL_BINARY_INSTALL_DIR@"
4143
PATCH_COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_BINARY_DIR}/config/leveldb" "${CMAKE_CURRENT_BINARY_DIR}/download/leveldb-prefix/src/leveldb/."
42-
CMAKE_ARGS ${CMAKE_ARGS}
43-
${COMMON_CMAKE_ARGS}
44-
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
44+
CMAKE_ARGS ${CMAKE_ARGS}
45+
${COMMON_CMAKE_ARGS}
46+
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
4547
-DCMAKE_SYSTEM_PREFIX_PATH=<INSTALL_DIR>
4648
-DHAVE_CRC32C=OFF
4749
-DHAVE_TCMALLOC=OFF
4850
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
49-
BUILD_COMMAND "${CMAKE_COMMAND}" --build . --config ${CMAKE_BUILD_TYPE} ${EXTERNAL_BUILD_FLAGS}
51+
BUILD_COMMAND "${CMAKE_COMMAND}" --build . --config ${CMAKE_BUILD_TYPE} ${EXTERNAL_BUILD_FLAGS}
5052
TEST_COMMAND ""
5153
)
54+
5255
ExternalProject_Add_StepDependencies(leveldb build snappy)

external/rapidjson/CMakeLists.txt.rapidjson.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ include(ExternalProject)
2323
ExternalProject_Add(rapidjson
2424
GIT_REPOSITORY @OLP_SDK_CPP_RAPIDJSON_URL@
2525
GIT_TAG @OLP_SDK_CPP_RAPIDJSON_TAG@
26+
GIT_SHALLOW 1
2627
INSTALL_DIR "@EXTERNAL_BINARY_INSTALL_DIR@"
2728
CMAKE_ARGS @COMMON_PLATFORM_FLAGS@
2829
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>

0 commit comments

Comments
 (0)