Merge pull request #9 from njoy/party

Updated to new build system.
njoy · Oct 29, 2020 · 2a76934 · 2a76934
2 parents 7e2b958 + aeff0c6
commit 2a76934
Show file tree

Hide file tree

Showing 43 changed files with 188 additions and 3,290 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+bin
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +0,0 @@
-[submodule "dependencies/Log"]
-	path = dependencies/Log
-	url = https://github.com/njoy/Log.git
-[submodule "dependencies/dimwits"]
-	path = dependencies/dimwits
-	url = https://github.com/njoy/DimensionalAnalysis.git
-[submodule "dependencies/header-utilities"]
-	path = dependencies/header-utilities
-	url = https://github.com/njoy/header-utilities.git
-[submodule "dependencies/range-v3-adapter"]
-	path = dependencies/range-v3-adapter
-	url = https://github.com/njoy/range-v3-adapter.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( Log
+    GIT_REPOSITORY  https://github.com/njoy/Log
+    GIT_TAG         origin/master
+    GIT_SHALLOW     TRUE
+    )
+
+FetchContent_Declare( header-utilities
+    GIT_REPOSITORY  https://github.com/njoy/header-utilities
+    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
+    Log
+    header-utilities
+    dimwits
+    )
diff --git a/cmake/release_dependencies.cmake b/cmake/release_dependencies.cmake
@@ -0,0 +1,55 @@
+cmake_minimum_required( VERSION 3.14 )
+include( FetchContent )
+
+#######################################################################
+# Declare project dependencies
+#######################################################################
+
+FetchContent_Declare( catch-adapter
+    GIT_REPOSITORY  https://github.com/njoy/catch-adapter
+    GIT_TAG         fb84b82ebf7a4789aa43cea560680cf745c6ee4f
+    )
+
+FetchContent_Declare( dimwits
+    GIT_REPOSITORY  https://github.com/njoy/DimensionalAnalysis
+    GIT_TAG         acd794d373c8740a788f5c9d58a6eb8ba4d9861a
+    )
+
+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         918640514e23d9adbbc7ab4fc499696e309fd054
+    )
+
+FetchContent_Declare( Log
+    GIT_REPOSITORY  https://github.com/njoy/Log
+    GIT_TAG         52962b7796afe37ef1d8f7edb4bf9ecb1b868d15
+    )
+
+FetchContent_Declare( range-v3-adapter
+    GIT_REPOSITORY  https://github.com/njoy/range-v3-adapter
+    GIT_TAG         252679d4737c8f755d87c0e1eed6c37394a2ec59
+    )
+
+FetchContent_Declare( spdlog
+    GIT_REPOSITORY  https://github.com/gabime/spdlog
+    GIT_TAG         a51b4856377a71f81b6d74b9af459305c4c644f8
+    )
+
+#######################################################################
+# Load dependencies
+#######################################################################
+
+FetchContent_MakeAvailable(
+    catch-adapter
+    dimwits
+    hana-adapter
+    header-utilities
+    Log
+    range-v3-adapter
+    spdlog
+    )
diff --git a/cmake/unit_testing.cmake b/cmake/unit_testing.cmake
@@ -0,0 +1,39 @@
+#######################################################################
+# Setup
+#######################################################################
+
+message( STATUS "Adding interpolation unit testing" )
+enable_testing()
+
+
+#######################################################################
+# Unit testing directories
+#######################################################################
+
+add_subdirectory( src/interpolation/Interpolant/Histogram/test )
+add_subdirectory( src/interpolation/Interpolant/LinearLinear/test )
+add_subdirectory( src/interpolation/Interpolant/LinearLogarithmic/test )
+add_subdirectory( src/interpolation/Interpolant/LogarithmicLinear/test )
+add_subdirectory( src/interpolation/Interpolant/LogarithmicLogarithmic/test )
+add_subdirectory( src/interpolation/table/Table/test )
+add_subdirectory( src/interpolation/table/Type/test )
+add_subdirectory( src/interpolation/table/Variant/Iterator/helper/test )
+add_subdirectory( src/interpolation/table/Variant/Iterator/test )
+add_subdirectory( src/interpolation/table/Variant/test )
+add_subdirectory( src/interpolation/table/Vector/test )
+add_subdirectory( src/interpolation/table/domain/max/IsCompiletimeConstant/test )
+add_subdirectory( src/interpolation/table/domain/max/IsRuntimeConstant/test )
+add_subdirectory( src/interpolation/table/domain/min/IsCompiletimeConstant/test )
+add_subdirectory( src/interpolation/table/domain/min/IsRuntimeConstant/test )
+add_subdirectory( src/interpolation/table/left/interval/IsAsymptotic/test )
+add_subdirectory( src/interpolation/table/left/interval/IsCompiletimeConstant/test )
+add_subdirectory( src/interpolation/table/left/interval/IsRuntimeConstant/test )
+add_subdirectory( src/interpolation/table/left/interval/Throws/test )
+add_subdirectory( src/interpolation/table/make/test )
+add_subdirectory( src/interpolation/table/right/interval/IsAsymptotic/test )
+add_subdirectory( src/interpolation/table/right/interval/IsCompiletimeConstant/test )
+add_subdirectory( src/interpolation/table/right/interval/IsRuntimeConstant/test )
+add_subdirectory( src/interpolation/table/right/interval/Throws/test )
+add_subdirectory( src/interpolation/table/search/test )
+add_subdirectory( src/interpolation/table/transform/test )
+add_subdirectory( src/interpolation/test )
diff --git a/dependencies/Log b/dependencies/Log
diff --git a/dependencies/dimwits b/dependencies/dimwits
diff --git a/dependencies/header-utilities b/dependencies/header-utilities
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