Updated to new build system.

njoy · Oct 29, 2020 · f460461 · f460461
1 parent e04ed6e
commit f460461
Show file tree

Hide file tree

Showing 41 changed files with 108 additions and 3,078 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +0,0 @@
-[submodule "dependencies/catch-adapter"]
-	path = dependencies/catch-adapter
-	url = https://github.com/njoy/catch-adapter.git
-[submodule "dependencies/dimwits"]
-	path = dependencies/dimwits
-	url = https://github.com/njoy/DimensionalAnalysis.git
-[submodule "dependencies/range-v3-adapter"]
-	path = dependencies/range-v3-adapter
-	url = https://github.com/njoy/range-v3-adapter.git
-[submodule "dependencies/Log"]
-	path = dependencies/Log
-	url = https://github.com/njoy/Log.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/cmake/develop_dependencies.cmake b/cmake/develop_dependencies.cmake
@@ -0,0 +1,41 @@
+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         origin/master
+    GIT_SHALLOW     TRUE
+    )
+
+FetchContent_Declare( catch-adapter
+    GIT_REPOSITORY  https://github.com/njoy/catch-adapter
+    GIT_TAG         origin/master
+    GIT_SHALLOW     TRUE
+    )
+
+FetchContent_Declare( Log
+    GIT_REPOSITORY  https://github.com/njoy/Log
+    GIT_TAG         origin/master
+    GIT_SHALLOW     TRUE
+    )
+
+FetchContent_Declare( dimwits
+    GIT_REPOSITORY  https://github.com/njoy/DimensionalAnalysis
+    GIT_TAG         origin/master
+    GIT_SHALLOW     TRUE
+    )
+
+#######################################################################
+# Load dependencies
+#######################################################################
+
+FetchContent_MakeAvailable(
+    range-v3-adapter
+    catch-adapter
+    Log
+    dimwits
+    )
diff --git a/cmake/unit_testing.cmake b/cmake/unit_testing.cmake
@@ -0,0 +1,15 @@
+#######################################################################
+# Setup
+#######################################################################
+
+message( STATUS "Adding constants unit testing" )
+enable_testing()
+
+
+#######################################################################
+# Unit testing directories
+#######################################################################
+
+add_subdirectory( src/constants/CODATA2014/test )
+add_subdirectory( src/constants/CODATA2018/test )
+add_subdirectory( src/constants/math/test )
diff --git a/dependencies/Log b/dependencies/Log
diff --git a/dependencies/catch-adapter b/dependencies/catch-adapter
diff --git a/dependencies/dimwits b/dependencies/dimwits
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