Merge pull request #758 from jvdp1/reog_common

Minor changes related to `fypp` prepocessing
fortran-lang · Jan 9, 2024 · d89a6e2 · d89a6e2
2 parents c086185 + fd91311
commit d89a6e2
Show file tree

Hide file tree

Showing 13 changed files with 100 additions and 847 deletions.
diff --git a/API-doc-FORD-file.md b/API-doc-FORD-file.md
@@ -3,6 +3,7 @@ project: Fortran-lang/stdlib
 summary: A community driven standard library for (modern) Fortran
 src_dir: src
 include: src
+         include
 exclude_dir: src/tests
 output_dir: API-doc
 page_dir: doc

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -65,6 +65,7 @@ list(
   "-DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}"
   "-DPROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR}"
   "-DPROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH}"
+  "-I${PROJECT_SOURCE_DIR}/include"
 )
 
 add_subdirectory(src)

diff --git a/ci/fpm-deployment.sh b/ci/fpm-deployment.sh
@@ -30,14 +30,13 @@ prune=(
   "$destdir/test/test_always_fail.f90"
   "$destdir/test/test_always_skip.f90"
   "$destdir/test/test_hash_functions.f90"
-  "$destdir/src/common.f90"
   "$destdir/src/f18estop.f90"
 )
 
 major=$(cut -d. -f1 VERSION)
 minor=$(cut -d. -f2 VERSION)
 patch=$(cut -d. -f3 VERSION)
-fyflags="${fyflags} -DPROJECT_VERSION_MAJOR=${major} -DPROJECT_VERSION_MINOR=${minor} -DPROJECT_VERSION_PATCH=${patch}"
+fyflags="${fyflags} -DPROJECT_VERSION_MAJOR=${major} -DPROJECT_VERSION_MINOR=${minor} -DPROJECT_VERSION_PATCH=${patch} -I include"
 
 mkdir -p "$destdir/src" "$destdir/test" "$destdir/example"
 

diff --git a/src/common.fypp → include/common.fypp b/src/common.fypp → include/common.fypp
diff --git a/src/f08estop.f90 b/src/f08estop.f90
@@ -1,4 +1,4 @@
-submodule (stdlib_error) estop
+submodule (stdlib_error) f08estop
 
 implicit none
 
@@ -38,4 +38,4 @@
 endif
 end procedure
 
-end submodule
+end submodule f08estop
diff --git a/src/f18estop.f90 b/src/f18estop.f90
@@ -1,4 +1,4 @@
-submodule (stdlib_error) estop
+submodule (stdlib_error) f18estop
 
 implicit none
 
@@ -26,4 +26,4 @@
 endif
 end procedure
 
-end submodule estop
+end submodule f18estop
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -10,11 +10,6 @@ macro(ADDTEST name)
              WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 endmacro(ADDTEST)
 
-list(
-  APPEND fyppFlags
-  "-I${PROJECT_SOURCE_DIR}/src"
-)
-
 add_subdirectory(array)
 add_subdirectory(ascii)
 add_subdirectory(bitsets)

diff --git a/test/hash_functions/CMakeLists.txt b/test/hash_functions/CMakeLists.txt
@@ -7,7 +7,7 @@ ADDTEST(hash_functions)
 target_sources(
   test_hash_functions
   PRIVATE
-  nmhash_scalar.c
+  nmhash.c
   pengyhash.c
   SpookyV2.cpp
   SpookyV2Test.cpp

diff --git a/test/hash_functions/generate_hash_arrays.cpp b/test/hash_functions/generate_hash_arrays.cpp
@@ -3,7 +3,6 @@
 
 extern "C" {
   #include "nmhash.h"
-  #include "nmhash_scalar.h"
   #include "pengyhash.h"
   #include "waterhash.h"
   int generate_all_c_hash();

diff --git a/test/hash_functions/nmhash_scalar.c b/test/hash_functions/nmhash_scalar.c