Merge remote-tracking branch 'upstream/master' into extract_demo

Author: jvdp1

CMakeLists.txt

@@ -48,8 +48,31 @@ if(NOT FYPP)
   message(FATAL_ERROR "Preprocessor fypp not found! Please install fypp following the instructions in https://fypp.readthedocs.io/en/stable/fypp.html#installing")
 endif()
 
+# Custom preprocessor flags
+if(DEFINED CMAKE_MAXIMUM_RANK)
+  set(fyppFlags "-DMAXRANK=${CMAKE_MAXIMUM_RANK}")
+elseif(f03rank)
+  set(fyppFlags)
+else()
+  set(fyppFlags "-DVERSION90")
+endif()
+
+list(
+  APPEND fyppFlags
+  "-DWITH_QP=$<BOOL:${WITH_QP}>"
+  "-DWITH_XDP=$<BOOL:${WITH_XDP}>"
+  "-DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}"
+  "-DPROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR}"
+  "-DPROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH}"
+)
+
 add_subdirectory(src)
 
+if(BUILD_TESTING)
+  enable_testing()
+  add_subdirectory(test)
+endif()
+
 install(EXPORT ${PROJECT_NAME}-targets
         NAMESPACE ${PROJECT_NAME}::
         DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"

STYLE_GUIDE.md

@@ -47,8 +47,8 @@ find src -maxdepth 1 -iname "*.fypp" \
 
 # Collect stdlib source files
 find src -maxdepth 1 -iname "*.f90" -exec cp {} "$destdir/src/" \;
-find src/tests -name "test_*.f90" -exec cp {} "$destdir/test/" \;
-find src/tests -name "*.dat" -exec cp {} "$destdir/" \;
+find test -name "test_*.f90" -exec cp {} "$destdir/test/" \;
+find test -name "*.dat" -exec cp {} "$destdir/" \;
 find src/examples -name "example_*.f90" -exec cp {} "$destdir/example/" \;
 
 # Include additional files

WORKFLOW.md

@@ -61,24 +61,6 @@ set(fppFiles
 )
 
 
-# Custom preprocessor flags
-if(DEFINED CMAKE_MAXIMUM_RANK)
-  set(fyppFlags "-DMAXRANK=${CMAKE_MAXIMUM_RANK}")
-elseif(f03rank)
-  set(fyppFlags)
-else()
-  set(fyppFlags "-DVERSION90")
-endif()
-
-list(
-  APPEND fyppFlags
-  "-DWITH_QP=$<BOOL:${WITH_QP}>"
-  "-DWITH_XDP=$<BOOL:${WITH_XDP}>"
-  "-DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}"
-  "-DPROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR}"
-  "-DPROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH}"
-)
-
 fypp_f90("${fyppFlags}" "${fppFiles}" outFiles)
 
 set(SRC
@@ -134,11 +116,7 @@ else()
   target_sources(${PROJECT_NAME} PRIVATE f08estop.f90)
 endif()
 
-if(BUILD_TESTING)
-  enable_testing()
-  add_subdirectory(tests)
-  add_subdirectory(examples)
-endif()
+add_subdirectory(examples)
 
 install(TARGETS ${PROJECT_NAME}
         EXPORT ${PROJECT_NAME}-targets