File tree Expand file tree Collapse file tree 3 files changed +2
-23
lines changed Expand file tree Collapse file tree 3 files changed +2
-23
lines changed Original file line number Diff line number Diff line change @@ -305,12 +305,7 @@ option(GLM_TEST_ENABLE "Build unit tests" OFF)
305305set (BUILD_SHARED_LIBS ${_OLD_BUILD_SHARED_LIBS} )
306306set (BUILD_STATIC_LIBS ${_OLD_BUILD_STATIC_LIBS} )
307307
308-
309308if (NBL_BUILD_MITSUBA_LOADER)
310- if (NBL_UPDATE_GIT_SUBMODULE)
311- update_git_submodule(./libexpat)
312- endif ()
313-
314309 option (BUILD_tools "EXPAT: build the xmlwf tool for expat library" OFF )
315310 option (BUILD_examples "EXPAT: build the examples for expat library" OFF )
316311 option (BUILD_tests "EXPAT: build the tests for expat library" OFF )
@@ -331,25 +326,14 @@ if (NBL_BUILD_MITSUBA_LOADER)
331326 set (MITSUBA_LOADER_DEPENDENT_LIBS ${MITSUBA_LOADER_DEPENDENT_LIBS} PARENT_SCOPE)
332327endif ()
333328
334-
335329if (NBL_BUILD_BULLET)
336- if (NBL_UPDATE_GIT_SUBMODULE)
337- update_git_submodule(./bullet3)
338- endif ()
339330 set (BULLET_INCLUDE_PATH
340331 ${CMAKE_CURRENT_SOURCE_DIR} /bullet3/src
341332 )
342333
343334 set (BULLET_INCLUDE_PATH ${BULLET_INCLUDE_PATH} PARENT_SCOPE)
344335endif ()
345336
346-
347- if (NBL_COMPILE_WITH_CUDA)
348- if (NBL_UPDATE_GIT_SUBMODULE)
349- update_git_submodule(./jitify)
350- endif ()
351- endif ()
352-
353337# Final gather
354338set (NBL_3RDPARTY_TARGETS
355339 lzma
Original file line number Diff line number Diff line change @@ -329,6 +329,7 @@ get_filename_component(NBL_MEDIA_DIRECTORY_ABS "${NBL_MEDIA_DIRECTORY}" ABSOLUTE
329329
330330option (NBL_UPDATE_GIT_SUBMODULE "Turn this ON to let CMake update all public submodules for you" ON )
331331option (NBL_UPDATE_GIT_SUBMODULE_INCLUDE_PRIVATE "Turn this ON to attempt to update private Nabla submodules" OFF )
332+
332333find_package (Git REQUIRED)
333334find_package (Python3 COMPONENTS Interpreter REQUIRED)
334335include (common)
Original file line number Diff line number Diff line change 1515include (ProcessorCount)
1616set (_NBL_CPACK_PACKAGE_RELATIVE_ENTRY_ "$<$<NOT:$<STREQUAL:$<CONFIG>,Release>>:$<LOWER_CASE:$<CONFIG>>>" CACHE INTERNAL "" )
1717
18- # submodule managment
19- function (update_git_submodule _PATH)
20- execute_process (COMMAND git submodule update --init --recursive ${_PATH}
21- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR} "
22- )
23- endfunction ()
24-
2518# TODO: REDO THIS WHOLE THING AS FUNCTIONS
2619# https://github.com/buildaworldnet/IrrlichtBAW/issues/311 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1
2720
@@ -1312,6 +1305,7 @@ function(NBL_UPDATE_SUBMODULES)
13121305 #NBL_WRAPPER_COMMAND("" ./ci TRUE "") TODO: enable it once we merge Ditt, etc
13131306 NBL_WRAPPER_COMMAND("" ./examples_tests FALSE "" )
13141307 NBL_WRAPPER_COMMAND(examples_tests ./media FALSE "" )
1308+ NBL_WRAPPER_COMMAND("" ./tests FALSE "" )
13151309 endif ()
13161310
13171311 file (WRITE "${_NBL_UPDATE_SUBMODULES_CMD_FILE_} " "${_NBL_UPDATE_SUBMODULES_COMMANDS_} " )
You can’t perform that action at this time.
0 commit comments