From b41aa08464f408fcf6d1f894ff41c1ff0221a06f Mon Sep 17 00:00:00 2001 From: paulfd Date: Sun, 8 Sep 2019 18:17:58 +0200 Subject: [PATCH] Updated modules --- .gitmodules | 5 +++++ CMakeLists.txt | 28 ++++++++++++++-------------- external/Catch2 | 2 +- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.gitmodules b/.gitmodules index 092997c3..02cf3b99 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,20 @@ [submodule "external/abseil-cpp"] path = external/abseil-cpp url = https://github.com/abseil/abseil-cpp + shallow = true [submodule "external/Catch2"] path = external/Catch2 url = https://github.com/catchorg/Catch2 + shallow = true [submodule "external/benchmark"] path = external/benchmark url = https://github.com/google/benchmark + shallow = true [submodule "external/readerwriterqueue"] path = external/readerwriterqueue url = https://github.com/cameron314/readerwriterqueue.git + shallow = true [submodule "external/cnpy"] path = external/cnpy url = https://github.com/rogersce/cnpy.git + shallow = true diff --git a/CMakeLists.txt b/CMakeLists.txt index 70ddfc16..ae9e4769 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,20 +31,20 @@ message("Cmake flags: ${CMAKE_CXX_FLAGS}") # Export the compile_commands.json file set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -find_package(Git QUIET) -if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") +# find_package(Git QUIET) +# if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") # Update submodules as needed - option(GIT_SUBMODULE "Check submodules during build" ON) - if(GIT_SUBMODULE) - message(STATUS "Submodule update") - execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive --remote - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - RESULT_VARIABLE GIT_SUBMOD_RESULT) - if(NOT GIT_SUBMOD_RESULT EQUAL "0") - message(FATAL_ERROR "git submodule update --init failed with ${GIT_SUBMOD_RESULT}, please checkout submodules") - endif() - endif() -endif() +# option(GIT_SUBMODULE "Check submodules during build" ON) + # if(GIT_SUBMODULE) + # message(STATUS "Submodule update") + # execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive --remote + # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + # RESULT_VARIABLE GIT_SUBMOD_RESULT) + # if(NOT GIT_SUBMOD_RESULT EQUAL "0") +# message(FATAL_ERROR "git submodule update --init failed with ${GIT_SUBMOD_RESULT}, please checkout submodules") +# endif() +# endif() +# endif() # Build options and includes set(BUILD_TESTING OFF CACHE BOOL "Disable Abseil's tests") @@ -87,4 +87,4 @@ set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Disable Google Benchmark tests") set(BENCHMARK_ENABLE_INSTALL OFF CACHE BOOL "Disable Google Benchmark install") add_subdirectory(external/benchmark EXCLUDE_FROM_ALL) add_subdirectory(benchmarks) -endif() \ No newline at end of file +endif() diff --git a/external/Catch2 b/external/Catch2 index f2c2711b..dd1f0f1c 160000 --- a/external/Catch2 +++ b/external/Catch2 @@ -1 +1 @@ -Subproject commit f2c2711bdcc583938e444f2039b9ceba840defcf +Subproject commit dd1f0f1c7298cb51389cf5a2f8946aa0c8ca621c