From a5dc89ef45b15cd8fe27688758a9b0b8ee71d210 Mon Sep 17 00:00:00 2001 From: Saveliy Date: Thu, 17 Oct 2024 17:13:12 +0300 Subject: [PATCH] add submodules --- .gitmodules | 6 ++++++ 3rdparty/googletest | 1 + 3rdparty/kokkos | 1 + sln/gtest/CMakeLists.txt | 2 +- sln/test_FDTD_method/CMakeLists.txt | 2 +- 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 3rdparty/googletest create mode 160000 3rdparty/kokkos diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..41a0b09 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "3rdparty/googletest"] + path = 3rdparty/googletest + url = https://github.com/google/googletest +[submodule "3rdparty/kokkos"] + path = 3rdparty/kokkos + url = https://github.com/kokkos/kokkos diff --git a/3rdparty/googletest b/3rdparty/googletest new file mode 160000 index 0000000..df1544b --- /dev/null +++ b/3rdparty/googletest @@ -0,0 +1 @@ +Subproject commit df1544bcee0c7ce35cd5ea0b3eb8cc81855a4140 diff --git a/3rdparty/kokkos b/3rdparty/kokkos new file mode 160000 index 0000000..3fe17d9 --- /dev/null +++ b/3rdparty/kokkos @@ -0,0 +1 @@ +Subproject commit 3fe17d96d42eb2bd84f1f2a835a2ed0ba87606b6 diff --git a/sln/gtest/CMakeLists.txt b/sln/gtest/CMakeLists.txt index 618a443..851502f 100644 --- a/sln/gtest/CMakeLists.txt +++ b/sln/gtest/CMakeLists.txt @@ -1,6 +1,6 @@ set(target "gtest") -add_library(${target} STATIC ../../gtest/gtest-all.cc) +add_library(${target} STATIC ../../3rdparty/googletest/googletest/src/gtest-all.cc) if((${CMAKE_CXX_COMPILER_ID} MATCHES "GNU" OR ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") AND diff --git a/sln/test_FDTD_method/CMakeLists.txt b/sln/test_FDTD_method/CMakeLists.txt index abebe6d..cb28b2a 100644 --- a/sln/test_FDTD_method/CMakeLists.txt +++ b/sln/test_FDTD_method/CMakeLists.txt @@ -1,6 +1,6 @@ set(target test_FDTD_method) -file(GLOB hdrs "*.h*" "../../include/*.h" "../../gtest/*.h") +file(GLOB hdrs "*.h*" "../../include/*.h" "../../3rdparty/googletest/googletest/include/gtest/gtest.h") #file(GLOB hdrs "*.h*") file(GLOB srcs "*.cpp" "../../src/*.cpp" "../../test/*.cpp")