Skip to content

Commit 2816212

Browse files
committed
introduce NBL_CI_GIT_SUBMODULES_SHALLOW, reference missing wave library submodule init by NBL_WRAPPER_COMMAND
1 parent 2ac6c9b commit 2816212

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ get_filename_component(NBL_MEDIA_DIRECTORY_ABS "${NBL_MEDIA_DIRECTORY}" ABSOLUTE
329329

330330
option(NBL_UPDATE_GIT_SUBMODULE "Turn this ON to let CMake update all public submodules for you" ON)
331331
option(NBL_UPDATE_GIT_SUBMODULE_INCLUDE_PRIVATE "Turn this ON to attempt to update private Nabla submodules" OFF)
332+
option(NBL_CI_GIT_SUBMODULES_SHALLOW "" OFF)
332333

333334
find_package(Git REQUIRED)
334335
find_package (Python3 COMPONENTS Interpreter REQUIRED)

cmake/common.cmake

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,11 +1278,17 @@ function(NBL_UPDATE_SUBMODULES)
12781278
else()
12791279
set(NBL_EXCLUDE "-c submodule.\"${EXCLUDE_SUBMODULE_PATH}\".update=none")
12801280
endif()
1281+
1282+
if(NBL_CI_GIT_SUBMODULES_SHALLOW)
1283+
set(NBL_SHALLOW "--depth=1")
1284+
else()
1285+
set(NBL_SHALLOW "")
1286+
endif()
12811287

12821288
if(SHOULD_RECURSIVE)
1283-
string(APPEND _NBL_UPDATE_SUBMODULES_COMMANDS_ "\"${GIT_EXECUTABLE}\" ${NBL_EXCLUDE} -C \"${NBL_ROOT_PATH}/${GIT_RELATIVE_ENTRY}\" submodule update --init --recursive ${GIT_SUBMODULE_PATH}\n")
1289+
string(APPEND _NBL_UPDATE_SUBMODULES_COMMANDS_ "\"${GIT_EXECUTABLE}\" ${NBL_EXCLUDE} -C \"${NBL_ROOT_PATH}/${GIT_RELATIVE_ENTRY}\" submodule update --init --recursive ${NBL_SHALLOW} ${GIT_SUBMODULE_PATH}\n")
12841290
else()
1285-
string(APPEND _NBL_UPDATE_SUBMODULES_COMMANDS_ "\"${GIT_EXECUTABLE}\" -C \"${NBL_ROOT_PATH}/${GIT_RELATIVE_ENTRY}\" submodule update --init ${GIT_SUBMODULE_PATH}\n")
1291+
string(APPEND _NBL_UPDATE_SUBMODULES_COMMANDS_ "\"${GIT_EXECUTABLE}\" -C \"${NBL_ROOT_PATH}/${GIT_RELATIVE_ENTRY}\" submodule update --init ${NBL_SHALLOW} ${GIT_SUBMODULE_PATH}\n")
12861292
endif()
12871293
endmacro()
12881294

@@ -1296,9 +1302,13 @@ function(NBL_UPDATE_SUBMODULES)
12961302
if(NBL_UPDATE_GIT_SUBMODULE_INCLUDE_PRIVATE)
12971303
NBL_WRAPPER_COMMAND("" "" TRUE "")
12981304
else()
1305+
# 3rdparty except boost
12991306
NBL_WRAPPER_COMMAND("" ./3rdparty TRUE "3rdparty/boost/superproject")
1307+
1308+
# boost 3rdaprty
13001309
NBL_WRAPPER_COMMAND(3rdparty/boost "./superproject" FALSE "")
1301-
foreach(BOOST_LIB IN LISTS NBL_BOOST_LIBS)
1310+
NBL_WRAPPER_COMMAND(3rdparty/boost/superproject "./libs/wave" TRUE "") # boost's wave
1311+
foreach(BOOST_LIB IN LISTS NBL_BOOST_LIBS) # deps of the wave
13021312
NBL_WRAPPER_COMMAND(3rdparty/boost/superproject "./libs/${BOOST_LIB}" TRUE "")
13031313
endforeach()
13041314

0 commit comments

Comments
 (0)