#676: move includes so pressio-ops comes first; fix version compabili…

…ty in cmakelists
Pressio · Sep 27, 2024 · a936b86 · a936b86
1 parent 2c5959b
commit a936b86
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 42 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,11 +4,30 @@ project(pressio C CXX)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(colors)
 
+#=====================================================================
+# pull in pressio-ops
+#=====================================================================
+include(FetchContent)
+
+message("${Green}-- Fetching pressio-ops...")
+
+FetchContent_Declare(
+  pressio-ops
+  GIT_REPOSITORY https://github.com/Pressio/pressio-ops.git
+  GIT_TAG        fix-compatibility-with-pressio
+  GIT_PROGRESS   TRUE
+  GIT_SHALLOW    TRUE
+)
+
+FetchContent_MakeAvailable(pressio-ops)
+
+message("${Green}-- Done.")
+
 #=====================================================================
 # versioning
 #=====================================================================
 # adapted from Eigen
-file(READ "${PROJECT_SOURCE_DIR}/include/pressio/macros.hpp" _pressio_macros)
+file(READ "${pressio-ops_SOURCE_DIR}/include/pressio/ops_macros.hpp" _pressio_macros)
 string(REGEX MATCH "define[ \t]+PRESSIO_MAJOR_VERSION[ \t]+([0-9]+)" _pressio_major_version_match "${_pressio_macros}")
 set(PRESSIO_MAJOR_VERSION "${CMAKE_MATCH_1}")
 string(REGEX MATCH "define[ \t]+PRESSIO_MINOR_VERSION[ \t]+([0-9]+)" _pressio_minor_version_match "${_pressio_macros}")
@@ -36,25 +55,6 @@ if(CMAKE_CXX_STANDARD STREQUAL "17"
   endif()
 endif()
 
-#=====================================================================
-# pull in pressio-ops
-#=====================================================================
-include(FetchContent)
-
-message("${Green}-- Fetching pressio-ops...")
-
-FetchContent_Declare(
-  pressio-ops
-  GIT_REPOSITORY https://github.com/Pressio/pressio-ops.git
-  GIT_TAG        fix-compatibility-with-pressio
-  GIT_PROGRESS   TRUE
-  GIT_SHALLOW    TRUE
-)
-
-FetchContent_MakeAvailable(pressio-ops)
-
-message("${Green}-- Done.")
-
 ################################################################################
 
 include(GNUInstallDirs)

diff --git a/include/pressio/macros.hpp b/include/pressio/macros.hpp
@@ -51,10 +51,6 @@
 
 #include "pressio/ops_macros.hpp"
 
-#define PRESSIO_MAJOR_VERSION 0
-#define PRESSIO_MINOR_VERSION 14
-#define PRESSIO_PATCH_VERSION 0
-
 // ----------------------------------------
 // logging macros
 // ----------------------------------------

diff --git a/include/pressio/ode_concepts.hpp b/include/pressio/ode_concepts.hpp
@@ -50,10 +50,10 @@
 #define PRESSIO_ODE_CONCEPTS_TOPLEVEL_INC_HPP_
 
 #include "pressio/mpl.hpp"
-#include "./utils.hpp"
 #include "pressio/type_traits.hpp"
 #include "pressio/ops.hpp"
 
+#include "./utils.hpp"
 #include "./ode/ode_strong_types.hpp"
 #include "./ode/ode_enum_and_tags.hpp"
 #include "./ode/ode_stencil_containers.hpp"

diff --git a/include/pressio/ode_steppers_explicit.hpp b/include/pressio/ode_steppers_explicit.hpp
@@ -50,11 +50,11 @@
 #define PRESSIO_ODE_STEPPERS_EXPLICIT_HPP_
 
 #include "pressio/mpl.hpp"
-#include "./utils.hpp"
 #include "pressio/type_traits.hpp"
 #include "pressio/ops.hpp"
-#include "./solvers.hpp"
 
+#include "./utils.hpp"
+#include "./solvers.hpp"
 #include "./ode_concepts.hpp"
 #include "./ode/exceptions.hpp"
 #include "./ode/ode_strong_types.hpp"

diff --git a/include/pressio/ode_steppers_implicit.hpp b/include/pressio/ode_steppers_implicit.hpp
@@ -50,11 +50,11 @@
 #define PRESSIO_ODE_STEPPERS_IMPLICIT_HPP_
 
 #include "pressio/mpl.hpp"
-#include "./utils.hpp"
 #include "pressio/type_traits.hpp"
 #include "pressio/ops.hpp"
-#include "./solvers.hpp"
 
+#include "./utils.hpp"
+#include "./solvers.hpp"
 #include "./ode_concepts.hpp"
 #include "./ode/exceptions.hpp"
 #include "./ode/ode_strong_types.hpp"

diff --git a/include/pressio/rom_concepts.hpp b/include/pressio/rom_concepts.hpp
@@ -50,9 +50,10 @@
 #define PRESSIO_ROM_CONCEPTS_TOPLEVEL_INC_HPP_
 
 #include "pressio/mpl.hpp"
-#include "./utils.hpp"
 #include "pressio/type_traits.hpp"
 #include "pressio/ops.hpp"
+
+#include "./utils.hpp"
 #include "./solvers_linear.hpp"
 #include "./solvers_nonlinear.hpp"
 #include "./ode.hpp"

diff --git a/include/pressio/rom_galerkin_steady.hpp b/include/pressio/rom_galerkin_steady.hpp
@@ -50,9 +50,10 @@
 #define PRESSIO_ROM_GALERKIN_STEADY_TOPLEVEL_INCLUDE_HPP_
 
 #include "pressio/mpl.hpp"
-#include "./utils.hpp"
 #include "pressio/type_traits.hpp"
 #include "pressio/ops.hpp"
+
+#include "./utils.hpp"
 #include "./solvers_linear.hpp"
 #include "./solvers_nonlinear.hpp"
 #include "./ode.hpp"

diff --git a/include/pressio/rom_galerkin_unsteady.hpp b/include/pressio/rom_galerkin_unsteady.hpp
@@ -50,9 +50,10 @@
 #define PRESSIO_ROM_GALERKIN_UNSTEADY_TOPLEVEL_INCLUDE_HPP_
 
 #include "pressio/mpl.hpp"
-#include "./utils.hpp"
 #include "pressio/type_traits.hpp"
 #include "pressio/ops.hpp"
+
+#include "./utils.hpp"
 #include "./solvers_linear.hpp"
 #include "./solvers_nonlinear.hpp"
 #include "./ode.hpp"

diff --git a/include/pressio/rom_linear.hpp b/include/pressio/rom_linear.hpp
@@ -50,9 +50,10 @@
 #define PRESSIO_ROM_LINEAR_TOPLEVEL_INCLUDE_HPP_
 
 #include "pressio/mpl.hpp"
-#include "./utils.hpp"
 #include "pressio/type_traits.hpp"
 #include "pressio/ops.hpp"
+
+#include "./utils.hpp"
 #include "./solvers_linear.hpp"
 #include "./solvers_nonlinear.hpp"
 #include "./ode.hpp"

diff --git a/include/pressio/rom_lspg_steady.hpp b/include/pressio/rom_lspg_steady.hpp
@@ -50,9 +50,10 @@
 #define PRESSIO_ROM_LSPG_STEADY_TOPLEVEL_INCLUDE_HPP_
 
 #include "pressio/mpl.hpp"
-#include "./utils.hpp"
 #include "pressio/type_traits.hpp"
 #include "pressio/ops.hpp"
+
+#include "./utils.hpp"
 #include "./solvers_linear.hpp"
 #include "./solvers_nonlinear.hpp"
 #include "./ode.hpp"

diff --git a/include/pressio/rom_lspg_unsteady.hpp b/include/pressio/rom_lspg_unsteady.hpp
@@ -50,9 +50,10 @@
 #define PRESSIO_ROM_LSPG_UNSTEADY_TOPLEVEL_INCLUDE_HPP_
 
 #include "pressio/mpl.hpp"
-#include "./utils.hpp"
 #include "pressio/type_traits.hpp"
 #include "pressio/ops.hpp"
+
+#include "./utils.hpp"
 #include "./solvers_linear.hpp"
 #include "./solvers_nonlinear.hpp"
 #include "./ode.hpp"

diff --git a/include/pressio/rom_subspaces.hpp b/include/pressio/rom_subspaces.hpp
@@ -50,9 +50,10 @@
 #define PRESSIO_ROM_SUBSPACES_TOPLEVEL_INCLUDE_HPP_
 
 #include "pressio/mpl.hpp"
-#include "./utils.hpp"
 #include "pressio/type_traits.hpp"
 #include "pressio/ops.hpp"
+
+#include "./utils.hpp"
 #include "./solvers_linear.hpp"
 #include "./solvers_nonlinear.hpp"
 #include "./ode.hpp"

diff --git a/include/pressio/solvers_linear.hpp b/include/pressio/solvers_linear.hpp
@@ -50,8 +50,9 @@
 #define PRESSIO_LINEAR_SOLVERS_HPP_
 
 #include "pressio/mpl.hpp"
-#include "./utils.hpp"
 #include "pressio/type_traits.hpp"
+
+#include "./utils.hpp"
 #include "solvers_linear/solvers_linear_tags.hpp"
 #include "solvers_linear/solvers_linear_solver.hpp"
 

diff --git a/include/pressio/solvers_nonlinear_concepts.hpp b/include/pressio/solvers_nonlinear_concepts.hpp
@@ -50,9 +50,10 @@
 #define PRESSIO_NONLINEAR_SOLVERS_CONCEPTS_HPP_
 
 #include "pressio/mpl.hpp"
-#include "./utils.hpp"
 #include "pressio/type_traits.hpp"
 
+#include "./utils.hpp"
+
 #ifdef PRESSIO_ENABLE_CXX20
 #include "solvers_nonlinear/solvers_concepts_cxx20.hpp"
 #else

diff --git a/include/pressio/solvers_nonlinear_gaussnewton.hpp b/include/pressio/solvers_nonlinear_gaussnewton.hpp
@@ -50,12 +50,12 @@
 #define PRESSIO_NONLINEAR_SOLVERS_GAUSS_NEWTON_HPP_
 
 #include "pressio/mpl.hpp"
-#include "./utils.hpp"
 #include "pressio/type_traits.hpp"
 #include "pressio/expressions.hpp"
 #include "pressio/ops.hpp"
-#include "./solvers_linear.hpp"
 
+#include "./utils.hpp"
+#include "./solvers_linear.hpp"
 #include "./solvers_nonlinear/impl/qr.hpp"
 
 #include "solvers_nonlinear_concepts.hpp"

diff --git a/include/pressio/solvers_nonlinear_levmarq.hpp b/include/pressio/solvers_nonlinear_levmarq.hpp
@@ -50,10 +50,11 @@
 #define PRESSIO_NONLINEAR_SOLVERS_LEVEN_MAR_HPP_
 
 #include "pressio/mpl.hpp"
-#include "./utils.hpp"
 #include "pressio/type_traits.hpp"
 #include "pressio/expressions.hpp"
 #include "pressio/ops.hpp"
+
+#include "./utils.hpp"
 #include "./solvers_linear.hpp"
 
 #include "solvers_nonlinear_concepts.hpp"

diff --git a/include/pressio/solvers_nonlinear_newton.hpp b/include/pressio/solvers_nonlinear_newton.hpp
@@ -50,10 +50,11 @@
 #define PRESSIO_NONLINEAR_SOLVERS_NEWTON_HPP_
 
 #include "pressio/mpl.hpp"
-#include "./utils.hpp"
 #include "pressio/type_traits.hpp"
 #include "pressio/expressions.hpp"
 #include "pressio/ops.hpp"
+
+#include "./utils.hpp"
 #include "./solvers_linear.hpp"
 
 #include "solvers_nonlinear_concepts.hpp"