fix: cmake build scripts

JeffIrwin · Sep 2, 2022 · 247fcda · 247fcda
1 parent e913785
commit 247fcda
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 50 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14)
 project(
   "garden"
   LANGUAGES "Fortran"
-  VERSION "1.0.2"
+  VERSION "1.0.4"
 )
 
 option(INSTALL_PROJECT "Whether this project should be installed" TRUE)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -2,53 +2,66 @@ set(dir "${CMAKE_CURRENT_SOURCE_DIR}")
 
 set(
   srcs
-  "${dir}/garden.f90"
-  "${dir}/garden/ascii_string_generator_m.f90"
-  "${dir}/garden/assert_m.f90"
-  "${dir}/garden/command_line_m.f90"
-  "${dir}/garden/constants_m.f90"
-  "${dir}/garden/double_precision_input_m.f90"
-  "${dir}/garden/example_m.f90"
-  "${dir}/garden/generated_m.f90"
-  "${dir}/garden/generator_m.f90"
-  "${dir}/garden/individual_result_m.f90"
-  "${dir}/garden/input_m.f90"
-  "${dir}/garden/input_test_case_m.f90"
-  "${dir}/garden/integer_generator_m.f90"
-  "${dir}/garden/integer_input_m.f90"
-  "${dir}/garden/messages_m.f90"
-  "${dir}/garden/random_m.f90"
-  "${dir}/garden/result_m.f90"
-  "${dir}/garden/run_tests_m.f90"
-  "${dir}/garden/shrink_result_m.f90"
-  "${dir}/garden/simple_test_case_m.f90"
-  "${dir}/garden/simple_test_collection_m.f90"
-  "${dir}/garden/string_input_m.f90"
-  "${dir}/garden/test_case_result_m.f90"
-  "${dir}/garden/test_case_with_examples_m.f90"
-  "${dir}/garden/test_case_with_generator_m.f90"
-  "${dir}/garden/test_collection_result_m.f90"
-  "${dir}/garden/test_collection_with_input_m.f90"
-  "${dir}/garden/test_constructors_m.f90"
-  "${dir}/garden/test_interfaces_m.f90"
-  "${dir}/garden/test_item_m.f90"
-  "${dir}/garden/test_m.f90"
-  "${dir}/garden/test_result_item_m.f90"
-  "${dir}/garden/test_result_m.f90"
-  "${dir}/garden/transformation_failure_m.f90"
-  "${dir}/garden/transformed_m.f90"
-  "${dir}/garden/transforming_test_collection_m.f90"
-  "${dir}/garden/assert/doesnt_include_m.f90"
-  "${dir}/garden/assert/empty_m.f90"
-  "${dir}/garden/assert/equals_double_precision_m.f90"
-  "${dir}/garden/assert/equals_integer_m.f90"
-  "${dir}/garden/assert/equals_strings_m.f90"
-  "${dir}/garden/assert/equals_within_absolute_m.f90"
-  "${dir}/garden/assert/equals_within_relative_m.f90"
-  "${dir}/garden/assert/faster_than_m.f90"
-  "${dir}/garden/assert/includes_m.f90"
-  "${dir}/garden/assert/not_m.f90"
-  "${dir}/garden/assert/that_m.f90"
+  ${dir}/garden/utilities_m.f90
+  ${dir}/garden/generator_m.f90
+  ${dir}/garden/shrink_result_m.f90
+  ${dir}/garden/string_input_m.f90
+  ${dir}/garden/test_item_m.f90
+  ${dir}/garden/generated_m.f90
+  ${dir}/garden/test_case_with_generator_m.f90
+  ${dir}/garden/integer_input_m.f90
+  ${dir}/garden/test_interfaces_m.f90
+  ${dir}/garden/test_result_item_m.f90
+  ${dir}/garden/assert_m.f90
+  ${dir}/garden/constants_m.f90
+  ${dir}/garden/random_m.f90
+  ${dir}/garden/command_line_m.f90
+  ${dir}/garden/messages_m.f90
+  ${dir}/garden/assert/equals_integer_matrix_m.f90
+  ${dir}/garden/assert/equals_within_absolute_array_m.f90
+  ${dir}/garden/assert/equals_strings_m.f90
+  ${dir}/garden/assert/equals_within_relative_m.f90
+  ${dir}/garden/assert/equals_within_relative_tensor_m.f90
+  ${dir}/garden/assert/equals_within_absolute_matrix_m.f90
+  ${dir}/garden/assert/equals_within_absolute_tensor_m.f90
+  ${dir}/garden/assert/equals_within_absolute_m.f90
+  ${dir}/garden/assert/equals_integer_tensor_m.f90
+  ${dir}/garden/assert/not_m.f90
+  ${dir}/garden/assert/equals_double_precision_m.f90
+  ${dir}/garden/assert/equals_double_precision_matrix_m.f90
+  ${dir}/garden/assert/equals_integer_array_m.f90
+  ${dir}/garden/assert/includes_m.f90
+  ${dir}/garden/assert/equals_double_precision_array_m.f90
+  ${dir}/garden/assert/equals_double_precision_tensor_m.f90
+  ${dir}/garden/assert/that_m.f90
+  ${dir}/garden/assert/doesnt_include_m.f90
+  ${dir}/garden/assert/equals_within_relative_matrix_m.f90
+  ${dir}/garden/assert/empty_m.f90
+  ${dir}/garden/assert/faster_than_m.f90
+  ${dir}/garden/assert/equals_within_relative_array_m.f90
+  ${dir}/garden/assert/equals_integer_m.f90
+  ${dir}/garden/result_m.f90
+  ${dir}/garden/test_m.f90
+  ${dir}/garden/test_collection_with_input_m.f90
+  ${dir}/garden/example_m.f90
+  ${dir}/garden/transforming_test_collection_m.f90
+  ${dir}/garden/input_m.f90
+  ${dir}/garden/test_case_result_m.f90
+  ${dir}/garden/transformed_m.f90
+  ${dir}/garden/test_constructors_m.f90
+  ${dir}/garden/transformation_failure_m.f90
+  ${dir}/garden/double_precision_input_m.f90
+  ${dir}/garden/input_test_case_m.f90
+  ${dir}/garden/simple_test_case_m.f90
+  ${dir}/garden/ascii_string_generator_m.f90
+  ${dir}/garden/test_collection_result_m.f90
+  ${dir}/garden/simple_test_collection_m.f90
+  ${dir}/garden/test_result_m.f90
+  ${dir}/garden/integer_generator_m.f90
+  ${dir}/garden/test_case_with_examples_m.f90
+  ${dir}/garden/individual_result_m.f90
+  ${dir}/garden/run_tests_m.f90
+  ${dir}/garden.f90
 )
 
 set(

diff --git a/subprojects/CMakeLists.txt b/subprojects/CMakeLists.txt
@@ -9,7 +9,7 @@ if(NOT TARGET "iso_varying_string")
     FetchContent_Declare(
       "iso_varying_string"
       GIT_REPOSITORY "${iso_varying_string-url}"
-      GIT_TAG "v3.0.1"
+      GIT_TAG "v4.0.0"
     )
     FetchContent_MakeAvailable("iso_varying_string")
   endif()
@@ -31,7 +31,7 @@ if(NOT TARGET "strff")
     FetchContent_Declare(
       "strff"
       GIT_REPOSITORY "${strff-url}"
-      GIT_TAG "v3.0.0"
+      GIT_TAG "v3.1.0"
     )
     FetchContent_MakeAvailable("strff")
   endif()