Separate base and serial components

fortuno-repos · Mar 16, 2024 · fc7107d · fc7107d
1 parent a7e779f
commit fc7107d
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 26 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,11 +24,25 @@ project(
 #                                 Options                                                         #
 ]=================================================================================================]
 
+include(CMakeDependentOption)
+
 option(FORTUNO_BUILD_SHARED_LIBS "Fortuno: Build as shared library" ${PROJECT_IS_TOP_LEVEL})
 
-option(FORTUNO_BUILD_TESTS "Fortuno: Build test suite" ${PROJECT_IS_TOP_LEVEL})
+option(
+  FORTUNO_BUILD_SERIAL_INTERFACE
+  "Fortuno: whether serial interface should be built (or only base library)"
+  ${PROJECT_IS_TOP_LEVEL}
+)
 
-option(FORTUNO_BUILD_EXAMPLES "Fortuno: Build example apps" ${PROJECT_IS_TOP_LEVEL})
+cmake_dependent_option(
+  FORTUNO_BUILD_TESTS "Fortuno: Build test suite" ${PROJECT_IS_TOP_LEVEL}
+  "FORTUNO_BUILD_SERIAL_INTERFACE" OFF
+)
+
+cmake_dependent_option(
+  FORTUNO_BUILD_EXAMPLES "Fortuno: Build example apps" ${PROJECT_IS_TOP_LEVEL}
+  "FORTUNO_BUILD_SERIAL_INTERFACE" OFF
+)
 
 option(FORTUNO_INSTALL "Fortuno: Install project" ${PROJECT_IS_TOP_LEVEL})
 
@@ -57,7 +71,7 @@ set(BUILD_SHARED_LIBS ${FORTUNO_BUILD_SHARED_LIBS})
 ]=================================================================================================]
 
 add_subdirectory(src)
-if (FORTUNO_BUILD_EXAMPLES)
+if (FORTUNO_BUILD_SERIAL_INTERFACE AND FORTUNO_BUILD_EXAMPLES)
   add_subdirectory(example)
 endif ()
 

diff --git a/example/fixtured_tests.f90 b/example/fixtured_tests.f90
@@ -4,9 +4,9 @@
 
 module fixtured_tests
   use mylib, only : factorial
-  use fortuno, only : check => serial_check, test => serial_case_item,&
-      & suite => serial_suite_item, test_item, test_ptr_item,&
-      & serial_suite, serial_case_base
+  use fortuno_base, only : test_item
+  use fortuno_serial, only : check => serial_check, test => serial_case_item,&
+      & suite => serial_suite_item, serial_case_base
   implicit none
 
   private

diff --git a/example/simple_tests.f90 b/example/simple_tests.f90
@@ -4,8 +4,9 @@
 
 module simple_tests
   use mylib, only : factorial
-  use fortuno, only : is_equal, test => serial_case_item, check => serial_check,&
-      & suite => serial_suite_item, test_item
+  use fortuno_base, only : is_equal, test_item
+  use fortuno_serial, only : test => serial_case_item, check => serial_check,&
+      & suite => serial_suite_item
   implicit none
 
   private

diff --git a/example/testapp.f90 b/example/testapp.f90
@@ -4,7 +4,7 @@
 
 !> Test app, collecting and executing the tests
 program testapp
-  use fortuno, only : execute_serial_cmd_app
+  use fortuno_serial, only : execute_serial_cmd_app
   use simple_tests, only : get_simple_tests
   use fixtured_tests, only : get_fixtured_tests
   implicit none

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -13,10 +13,6 @@ set_target_properties(
 )
 add_library(Fortuno::Fortuno ALIAS Fortuno)
 
-target_sources(
-  Fortuno PRIVATE
-  fortuno.f90
-)
 add_subdirectory(fortuno)
 
 # Store generated mod-files in a separate folder

diff --git a/src/fortuno.f90 b/src/fortuno.f90
diff --git a/src/fortuno/CMakeLists.txt b/src/fortuno/CMakeLists.txt
@@ -6,7 +6,17 @@
 target_sources(
   Fortuno PRIVATE
   base.f90
-  serial.f90
 )
 add_subdirectory(base)
-add_subdirectory(serial)
+
+
+if (FORTUNO_BUILD_SERIAL_INTERFACE)
+
+  target_sources(
+    Fortuno PRIVATE
+    serial.f90
+  )
+  add_subdirectory(serial)
+  target_compile_definitions(Fortuno PRIVATE "WITH_SERIAL_INTERFACE")
+
+endif ()