Merge pull request #6 from jchristopherson/v1.0.3

V1.0.3

.github/workflows/cmake.yml

@@ -2,9 +2,9 @@ name: CMake
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "master" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "master" ]
 
 env:
   BUILD_TYPE: Release

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.24)
 project(
     collections 
     LANGUAGES Fortran
-    VERSION 1.0.2
+    VERSION 1.0.3
 )
 
 # Utilize the GNU installation structure
@@ -15,7 +15,6 @@ include("${PROJECT_SOURCE_DIR}/cmake/helper.cmake")
 add_subdirectory(configure)
 
 # Deal with dependencies
-find_package(ferror 1.4.2 QUIET)
 add_subdirectory(dependencies)
 
 # Source
@@ -30,9 +29,6 @@ add_fortran_library(
 )
 link_library(${PROJECT_NAME} ${ferror_LIBRARY} ${ferror_INCLUDE_DIR})
 
-# Installation
-add_subdirectory(install)
-
 # Testing
 option(BUILD_TESTING "Build tests")
 include(CTest)

dependencies/CMakeLists.txt

@@ -1,7 +1,3 @@
-# Get the macros and functions we'll need
-include("${PROJECT_SOURCE_DIR}/cmake/helper.cmake")
-include(FetchContent)
-
 # Get FERROR
 add_subdirectory(ferror)
 set(ferror_LIBRARY ${ferror_LIBRARY} PARENT_SCOPE)

dependencies/ferror/CMakeLists.txt

@@ -1,44 +1,18 @@
-# Get the macros and functions we'll need
-include("${PROJECT_SOURCE_DIR}/cmake/helper.cmake")
 include(FetchContent)
 
-# If found, us the installed version; else, import the library
-if (ferror_FOUND)
-    # Inform the user of what's going on
-    message(STATUS "FERROR (${ferror_VERSION}) library found.")
+# Fetch the proper content
+FetchContent_Declare(
+    ferror
+    GIT_REPOSITORY "https://github.com/jchristopherson/ferror"
+)
+FetchContent_MakeAvailable(ferror)
 
-    # Get the mod file location
-    get_target_property(ferror_INCLUDE_DIR ferror INTERFACE_INCLUDE_DIRECTORIES)
-else()
-    # Inform the user of what's going on
-    message(STATUS "FERROR library not found.  Downloading appropriate repository.")
-
-    # Fetch the proper content
-    FetchContent_Declare(
-        ferror
-        GIT_REPOSITORY "https://github.com/jchristopherson/ferror"
-        OVERRIDE_FIND_PACKAGE
-    )
-
-    FetchContent_MakeAvailable(ferror)
-
-    if (WIN32)
-        if (BUILD_SHARED_LIBS)
-            add_custom_command(
-                TARGET ${PROJECT_NAME} POST_BUILD
-                COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                $<TARGET_FILE:ferror>
-                $<TARGET_FILE_DIR:${PROJECT_NAME}
-            )
-        endif()
-    endif()
-
-    set(ferror_INCLUDE_DIR ${ferror_BINARY_DIR}/include)
-endif()
-
-# Make a parent-scope variable for the library
+set(ferror_INCLUDE_DIR ${ferror_BINARY_DIR}/include)
+configure_file(
+    "${ferror_SOURCE_DIR}/include/ferror.h"
+    "${ferror_INCLUDE_DIR}/ferror.h"
+    COPYONLY
+)
 set(ferror_LIBRARY ferror)
+set(ferror_INCLUDE_DIR ${ferror_INCLUDE_DIR} PARENT_SCOPE)
 set(ferror_LIBRARY ${ferror_LIBRARY} PARENT_SCOPE)
-
-# Make a parent-scope variable locating the include directory for ferror
-set(ferror_INCLUDE_DIR ${ferror_INCLUDE_DIR} PARENT_SCOPE)