Merge pull request #30 from jchristopherson/v1.5.6

V1.5.6

Author: jchristopherson

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.24)
 project(
     fstats
     LANGUAGES Fortran
-    VERSION 1.5.5
+    VERSION 1.5.6
 )
 set(CMAKE_Fortran_STANDARD 2018)
 set(CMAKE_Fortran_STANDARD_REQUIRED TRUE)

configure/template.cmake

@@ -2,12 +2,9 @@
 
 include(CMakeFindDependencyMacro)
 find_dependency(OpenMP COMPONENTS Fortran)
-
-if (NOT BUILD_SHARED_LIBS)
-  find_dependency(ferror QUIET)
-  find_dependency(linalg QUIET)
-  find_dependency(collections QUIET)
-endif()
+find_dependency(ferror QUIET)
+find_dependency(linalg QUIET)
+find_dependency(collections QUIET)
 
 if(NOT TARGET "@PROJECT_NAME@::@PROJECT_NAME@")
   include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake")

examples/CMakeLists.txt

@@ -1,14 +1,20 @@
 # Include Dependencies
 add_subdirectory(fortran_csv_module)
-include(FetchContent)
 
-FetchContent_Declare(
-    fplot
-    GIT_TAG "origin/master"
-    GIT_REPOSITORY https://github.com/jchristopherson/fplot
-)
-FetchContent_MakeAvailable(fplot)
-set(fplot_LIBRARY fplot forcolormap)
+find_package(fplot)
+if (NOT fplot_FOUND)
+    include(FetchContent)
+
+    FetchContent_Declare(
+        fplot
+        GIT_TAG "origin/master"
+        GIT_REPOSITORY https://github.com/jchristopherson/fplot
+    )
+    FetchContent_MakeAvailable(fplot)
+    set(fplot_LIBRARY fplot forcolormap)
+else()
+    set(fplot_LIBRARY fplot::fplot)
+endif()
 
 # Full Factorial Example
 add_executable(full_factorial_example full_factorial_example.f90)

fpm.toml

@@ -1,5 +1,5 @@
 name = "fstats"
-version = "1.5.5"
+version = "1.5.6"
 license = "GPL-3.0"
 author = "Jason Christopherson"
 maintainer = "Jason Christopherson"

src/CMakeLists.txt

@@ -33,8 +33,8 @@ set_source_files_properties(
 include(FetchContent)
 find_package(OpenMP REQUIRED COMPONENTS Fortran)
 find_package(ferror QUIET)
-find_package(linalg 1.8.9 QUIET)
-find_package(collections 1.0.8 QUIET)
+find_package(linalg 1.8.10 QUIET)
+find_package(collections 1.0.9 QUIET)
 if (NOT ferror_FOUND)
     message(STATUS "FERROR could not be found.  A reference version will be employed.")
     FetchContent_Declare(