don't use submodules

Use cmake FetchContent instead
This commit is contained in:
Henry Case 2021-05-26 08:01:47 +01:00
parent 974f62bb26
commit f3aa725c4c
6 changed files with 26 additions and 29 deletions

12
.gitmodules vendored
View File

@ -1,12 +0,0 @@
[submodule "test/pycparser"]
path = test/pycparser
url = https://github.com/eliben/pycparser.git
[submodule "3rd/gtest"]
path = 3rd/gtest
url = https://github.com/google/googletest.git
[submodule "3rd/gbench"]
path = 3rd/gbench
url = https://github.com/kriskwiatkowski/benchmark.git
[submodule "3rd/cpu_features"]
path = 3rd/cpu_features
url = https://github.com/kriskwiatkowski/cpu_features.git

@ -1 +0,0 @@
Subproject commit 2b07c2ab7df71d0b6c19afb93f68a808b412a7ff

@ -1 +0,0 @@
Subproject commit e45fcc64e02489f718df499a162b41f742a1b7e5

@ -1 +0,0 @@
Subproject commit 1a8ecf1813d022cc7914e04564b92decff6161fc

View File

@ -1,10 +1,36 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
project(cryptocore VERSION 0.0.1 LANGUAGES C) project(cryptocore VERSION 0.0.1 LANGUAGES C)
include(FetchContent)
enable_language(C) enable_language(C)
enable_language(CXX) enable_language(CXX)
enable_language(ASM) enable_language(ASM)
# Dependencies
FetchContent_Declare(
gtest
SOURCE_DIR ${PROJECT_SOURCE_DIR}/3rd/gtest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG a3460d1aeeaa43fdf137a6adefef10ba0b59fe4b
)
FetchContent_Populate(gtest)
FetchContent_Declare(
cpu_features
SOURCE_DIR ${PROJECT_SOURCE_DIR}/3rd/cpu_features
GIT_REPOSITORY https://github.com/google/cpu_features.git
GIT_TAG bc2846e78faeb26b8a46c17df369d4e5f1f9e2bb
)
FetchContent_Populate(cpu_features)
FetchContent_Declare(
gbench
SOURCE_DIR ${PROJECT_SOURCE_DIR}/3rd/gbench
GIT_REPOSITORY https://github.com/kriskwiatkowski/benchmark.git
GIT_TAG e45fcc64e02489f718df499a162b41f742a1b7e5
)
FetchContent_Populate(gbench)
add_subdirectory(3rd/gtest) add_subdirectory(3rd/gtest)
add_subdirectory(3rd/cpu_features) add_subdirectory(3rd/cpu_features)

View File

@ -1,14 +0,0 @@
kind: pipeline
type: exec
name: default
steps:
- name: build
commands:
- git submodule init
- git submodule update --recursive --remote
- mkdir build
- cd build
- cmake ..
- make
- ./test