Removed metaconfigure, switched to FetchContent.

njoy · Oct 19, 2020 · 0e692ca · 0e692ca
1 parent 7b3ae58
commit 0e692ca
Show file tree

Hide file tree

Showing 41 changed files with 192 additions and 3,289 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +0,0 @@
-[submodule "dependencies/catch-adapter"]
-	path = dependencies/catch-adapter
-	url = https://github.com/njoy/catch-adapter.git
-[submodule "dependencies/range-v3-adapter"]
-	path = dependencies/range-v3-adapter
-	url = https://github.com/njoy/range-v3-adapter
-[submodule "dependencies/ENDFtk"]
-	path = dependencies/ENDFtk
-	url = https://github.com/njoy/ENDFtk

diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/cmake/develop_dependencies.cmake b/cmake/develop_dependencies.cmake
@@ -0,0 +1,34 @@
+cmake_minimum_required( VERSION 3.14 )
+include( FetchContent )
+
+#######################################################################
+# Declare project dependencies
+#######################################################################
+
+FetchContent_Declare( ENDFtk
+    GIT_REPOSITORY  https://github.com/njoy/ENDFtk
+    GIT_TAG         origin/build/fetchcontent
+    GIT_SHALLOW     TRUE
+    )
+
+FetchContent_Declare( catch-adapter
+    GIT_REPOSITORY  https://github.com/njoy/catch-adapter
+    GIT_TAG         origin/build/fetchcontent
+    GIT_SHALLOW     TRUE
+    )
+
+FetchContent_Declare( range-v3-adapter
+    GIT_REPOSITORY  https://github.com/njoy/range-v3-adapter
+    GIT_TAG         origin/build/fetchcontent
+    GIT_SHALLOW     TRUE
+    )
+
+#######################################################################
+# Load dependencies
+#######################################################################
+
+FetchContent_MakeAvailable(
+    ENDFtk
+    catch-adapter
+    range-v3-adapter
+    )
diff --git a/cmake/release_dependencies.cmake b/cmake/release_dependencies.cmake
@@ -0,0 +1,67 @@
+cmake_minimum_required( VERSION 3.14 )
+include( FetchContent )
+
+#######################################################################
+# Declare project dependencies
+#######################################################################
+
+FetchContent_Declare( range-v3-adapter
+    GIT_REPOSITORY  https://github.com/njoy/range-v3-adapter
+    GIT_TAG         4d1a3bde6aba47ca59a65713f9cab7877ad2cc87
+    )
+
+FetchContent_Declare( hana-adapter
+    GIT_REPOSITORY  https://github.com/njoy/hana-adapter
+    GIT_TAG         f58e8973c9a614dc4f3720b5581a762c61bdbb40
+    )
+
+FetchContent_Declare( header-utilities
+    GIT_REPOSITORY  https://github.com/njoy/header-utilities
+    GIT_TAG         04f988c2b576630ef10fc0c3838c915f4a6e15d6
+    )
+
+FetchContent_Declare( ENDFtk
+    GIT_REPOSITORY  https://github.com/njoy/ENDFtk
+    GIT_TAG         1217062c298560824cb8f239465b3293df178deb
+    )
+
+FetchContent_Declare( catch-adapter
+    GIT_REPOSITORY  https://github.com/njoy/catch-adapter
+    GIT_TAG         fb84b82ebf7a4789aa43cea560680cf745c6ee4f
+    )
+
+FetchContent_Declare( Log
+    GIT_REPOSITORY  https://github.com/njoy/Log
+    GIT_TAG         e0f371dfef22b655bbd52e8783d037e6c594824a
+    )
+
+FetchContent_Declare( fmt-adapter
+    GIT_REPOSITORY  http://github.com/njoy/fmt-adapter
+    GIT_TAG         a6db6c8cf9534b028eb3dea4549934f7ae6abf9f
+    )
+
+FetchContent_Declare( spdlog-adapter
+    GIT_REPOSITORY  http://github.com/njoy/spdlog-adapter
+    GIT_TAG         39cd17919b2be662a45b9c33342b5a5f4f1feb4c
+    )
+
+FetchContent_Declare( disco
+    GIT_REPOSITORY  https://github.com/njoy/disco
+    GIT_TAG         178a03cf4a571fee028b008ffac85e20f6059ade
+    )
+
+#######################################################################
+# Load dependencies
+#######################################################################
+
+FetchContent_MakeAvailable(
+    range-v3-adapter
+    hana-adapter
+    header-utilities
+    ENDFtk
+    catch-adapter
+    Log
+    fmt-adapter
+    spdlog-adapter
+    disco
+    )
diff --git a/cmake/unit_testing.cmake b/cmake/unit_testing.cmake
@@ -0,0 +1,33 @@
+#######################################################################
+# Setup
+#######################################################################
+
+message( STATUS "Adding leapr unit testing" )
+enable_testing()
+
+
+#######################################################################
+# Unit testing directories
+#######################################################################
+
+add_subdirectory( src/coher/coher_util/hexLatticeFactors_util/test )
+add_subdirectory( src/coher/coher_util/test )
+add_subdirectory( src/coher/test )
+add_subdirectory( src/coldh/coldh_util/betaLoop_util/jprimeLoop_util/sumh_util/test )
+add_subdirectory( src/coldh/coldh_util/betaLoop_util/jprimeLoop_util/test )
+add_subdirectory( src/coldh/coldh_util/betaLoop_util/test )
+add_subdirectory( src/coldh/coldh_util/test )
+add_subdirectory( src/coldh/test )
+add_subdirectory( src/contin/contin_util/start_util/test )
+add_subdirectory( src/contin/contin_util/test )
+add_subdirectory( src/contin/test )
+add_subdirectory( src/discre/discre_util/oscLoopFuncs_util/test )
+add_subdirectory( src/discre/discre_util/test )
+add_subdirectory( src/discre/test )
+add_subdirectory( src/endout/endout_util/test )
+add_subdirectory( src/endout/test )
+add_subdirectory( src/generalTools/test )
+add_subdirectory( src/skold/test )
+add_subdirectory( src/test )
+add_subdirectory( src/trans/test )
+add_subdirectory( src/trans/trans_util/test )
diff --git a/dependencies/ENDFtk b/dependencies/ENDFtk
diff --git a/dependencies/catch-adapter b/dependencies/catch-adapter
diff --git a/dependencies/range-v3-adapter b/dependencies/range-v3-adapter
diff --git a/metaconfigure/LICENSE b/metaconfigure/LICENSE
diff --git a/metaconfigure/README.md b/metaconfigure/README.md
diff --git a/metaconfigure/__init__.py b/metaconfigure/__init__.py