sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated modules

Browse source
This commit is contained in:
paulfd 2019-09-08 18:17:58 +02:00
parent e07cbf8989
commit b41aa08464
3 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitmodules vendored
View file

@ -1,15 +1,20 @@
[submodule "external/abseil-cpp"] [submodule "external/abseil-cpp"]
path = external/abseil-cpp path = external/abseil-cpp
url = https://github.com/abseil/abseil-cpp url = https://github.com/abseil/abseil-cpp
shallow = true
[submodule "external/Catch2"] [submodule "external/Catch2"]
path = external/Catch2 path = external/Catch2
url = https://github.com/catchorg/Catch2 url = https://github.com/catchorg/Catch2
shallow = true
[submodule "external/benchmark"] [submodule "external/benchmark"]
path = external/benchmark path = external/benchmark
url = https://github.com/google/benchmark url = https://github.com/google/benchmark
shallow = true
[submodule "external/readerwriterqueue"] [submodule "external/readerwriterqueue"]
path = external/readerwriterqueue path = external/readerwriterqueue
url = https://github.com/cameron314/readerwriterqueue.git url = https://github.com/cameron314/readerwriterqueue.git
shallow = true
[submodule "external/cnpy"] [submodule "external/cnpy"]
path = external/cnpy path = external/cnpy
url = https://github.com/rogersce/cnpy.git url = https://github.com/rogersce/cnpy.git
shallow = true

28
CMakeLists.txt
View file

@ -31,20 +31,20 @@ message("Cmake flags: ${CMAKE_CXX_FLAGS}")
# Export the compile_commands.json file # Export the compile_commands.json file
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
find_package(Git QUIET) # find_package(Git QUIET)
if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") # if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
# Update submodules as needed # Update submodules as needed
option(GIT_SUBMODULE "Check submodules during build" ON) # option(GIT_SUBMODULE "Check submodules during build" ON)
if(GIT_SUBMODULE) # if(GIT_SUBMODULE)
message(STATUS "Submodule update") # message(STATUS "Submodule update")
execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive --remote # execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive --remote
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
RESULT_VARIABLE GIT_SUBMOD_RESULT) # RESULT_VARIABLE GIT_SUBMOD_RESULT)
if(NOT GIT_SUBMOD_RESULT EQUAL "0") # if(NOT GIT_SUBMOD_RESULT EQUAL "0")
message(FATAL_ERROR "git submodule update --init failed with ${GIT_SUBMOD_RESULT}, please checkout submodules") # message(FATAL_ERROR "git submodule update --init failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
endif() # endif()
endif() # endif()
endif() # endif()
# Build options and includes # Build options and includes
set(BUILD_TESTING OFF CACHE BOOL "Disable Abseil's tests") 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") set(BENCHMARK_ENABLE_INSTALL OFF CACHE BOOL "Disable Google Benchmark install")
add_subdirectory(external/benchmark EXCLUDE_FROM_ALL) add_subdirectory(external/benchmark EXCLUDE_FROM_ALL)
add_subdirectory(benchmarks) add_subdirectory(benchmarks)
endif() endif()

2
external/Catch2 vendored

@ -1 +1 @@
Subproject commit f2c2711bdcc583938e444f2039b9ceba840defcf Subproject commit dd1f0f1c7298cb51389cf5a2f8946aa0c8ca621c