From f3aa725c4c237ca6955b1ffcec47807fb3fa32f0 Mon Sep 17 00:00:00 2001 From: Kris Kwiatkowski Date: Wed, 26 May 2021 08:01:47 +0100 Subject: [PATCH] don't use submodules Use cmake FetchContent instead --- .gitmodules | 12 ------------ 3rd/cpu_features | 1 - 3rd/gbench | 1 - 3rd/gtest | 1 - CMakeLists.txt | 26 ++++++++++++++++++++++++++ buid.dbg/.drone.yml | 14 -------------- 6 files changed, 26 insertions(+), 29 deletions(-) delete mode 100644 .gitmodules delete mode 160000 3rd/cpu_features delete mode 160000 3rd/gbench delete mode 160000 3rd/gtest delete mode 100644 buid.dbg/.drone.yml diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 79ecd1fe..00000000 --- a/.gitmodules +++ /dev/null @@ -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 diff --git a/3rd/cpu_features b/3rd/cpu_features deleted file mode 160000 index 2b07c2ab..00000000 --- a/3rd/cpu_features +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2b07c2ab7df71d0b6c19afb93f68a808b412a7ff diff --git a/3rd/gbench b/3rd/gbench deleted file mode 160000 index e45fcc64..00000000 --- a/3rd/gbench +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e45fcc64e02489f718df499a162b41f742a1b7e5 diff --git a/3rd/gtest b/3rd/gtest deleted file mode 160000 index 1a8ecf18..00000000 --- a/3rd/gtest +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1a8ecf1813d022cc7914e04564b92decff6161fc diff --git a/CMakeLists.txt b/CMakeLists.txt index 60ec28f7..db254aaf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,36 @@ cmake_minimum_required(VERSION 3.13) project(cryptocore VERSION 0.0.1 LANGUAGES C) +include(FetchContent) enable_language(C) enable_language(CXX) 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/cpu_features) diff --git a/buid.dbg/.drone.yml b/buid.dbg/.drone.yml deleted file mode 100644 index 41c554ac..00000000 --- a/buid.dbg/.drone.yml +++ /dev/null @@ -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