Merge pull request #25 from jchristopherson/v1.5.1

Author: jchristopherson

CMakeLists.txt

@@ -3,46 +3,23 @@ cmake_minimum_required(VERSION 3.24)
 project(
     fstats
     LANGUAGES Fortran
-    VERSION 1.5.0
+    VERSION 1.5.1
 )
+set(CMAKE_Fortran_STANDARD 2018)
+set(CMAKE_Fortran_STANDARD_REQUIRED TRUE)
 
 # Confgiure everything
 add_subdirectory(configure)
 
-# Deal with the dependencies
-add_subdirectory(dependencies)
-
-# Get OpenMP
-find_package(OpenMP REQUIRED COMPONENTS Fortran)
-
 # Source
 add_subdirectory(src)
-set_source_files_properties(
-    ${FSTATS_SOURCES}
-    PROPERTIES Fortran_PREPROCESS ON
-)
-add_fortran_library(
-    ${PROJECT_NAME}
-    ${PROJECT_INCLUDE_DIR}
-    ${CMAKE_INSTALL_INCLUDEDIR}
-    ${PROJECT_VERSION}
-    ${PROJECT_VERSION_MAJOR}
-    ${FSTATS_SOURCES}
-)
-target_link_libraries(${PROJECT_NAME} PUBLIC 
-    ${ferror_LIBRARY} 
-    ${linalg_LIBRARY} 
-    ${collections_LIBRARY}
-)
-target_include_directories(${PROJECT_NAME} PUBLIC
-    $<BUILD_INTERFACE:${ferror_INCLUDE_DIR}>
-    $<BUILD_INTERFACE:${linalg_INCLUDE_DIR}>
-    $<BUILD_INTERFACE:${collections_INCLUDE_DIR}>
+
+# Install
+install(
+  EXPORT ${PROJECT_NAME}-targets
+  NAMESPACE ${PROJECT_NAME}::
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
 )
-if (OpenMP_Fortran_FOUND)
-    target_link_libraries(${PROJECT_NAME} PUBLIC OpenMP::OpenMP_Fortran)
-    target_compile_definitions(${PROJECT_NAME} PRIVATE USEOPENMP=1)
-endif()
 
 # Testing
 option(BUILD_TESTING "Build tests")

cmake/helper.cmake

@@ -1,6 +1,3 @@
-# Get the macros and functions we'll need
-include("${PROJECT_SOURCE_DIR}/cmake/helper.cmake")
-
 # Set a default build type if none was specified
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   message(STATUS "Setting build type to 'Release' as none was specified.")
@@ -13,11 +10,64 @@ endif()
 option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
 
 # Export all symbols on Windows when building libraries
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+SET(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
 
 # Utilize the GNU installation structure
 include(GNUInstallDirs)
 
-# Locate the local include directory
-set(PROJECT_INCLUDE_DIR ${PROJECT_BINARY_DIR}/include)
-set(PROJECT_INCLUDE_DIR ${PROJECT_INCLUDE_DIR} PARENT_SCOPE)
+# Module directory
+if(NOT DEFINED CMAKE_INSTALL_MODULEDIR)
+  set(
+    CMAKE_INSTALL_MODULEDIR
+    "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${CMAKE_Fortran_COMPILER_ID}-${CMAKE_Fortran_COMPILER_VERSION}"
+    CACHE
+    STRING
+    "Directory in prefix to install generated module files"
+  )
+endif()
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" PARENT_SCOPE)
+
+# Export a pkg-config file
+configure_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/template.pc"
+  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
+  @ONLY
+)
+
+install(
+  FILES
+  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+)
+
+# Export CMake package file
+include(CMakePackageConfigHelpers)
+configure_package_config_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/template.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
+  INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
+)
+
+if(BUILD_SHARED_LIBS OR PROJECT_VERSION_MAJOR EQUAL 0)
+  # Due to the uncertain ABI compatibility of Fortran shared libraries
+  # limit compatibility for dynamic linking to same minor version.
+  set(COMPATIBILITY SameMinorVersion)
+else()
+  # Require API compatibility via semantic versioning for static linking.
+  set(COMPATIBILITY SameMajorVersion)
+endif()
+
+write_basic_package_version_file(
+  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
+  VERSION "${PROJECT_VERSION}"
+  COMPATIBILITY ${COMPATIBILITY}
+)
+
+install(
+  FILES
+  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
+)

configure/CMakeLists.txt

@@ -0,0 +1,5 @@
+@PACKAGE_INIT@
+
+if(NOT TARGET "@PROJECT_NAME@::@PROJECT_NAME@")
+  include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
+endif()

configure/template.cmake

@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+moduledir=${prefix}/@CMAKE_INSTALL_MODULEDIR@
+
+Name: @PROJECT_NAME@
+Description: @PROJECT_DESCRIPTION@
+Version: @PROJECT_VERSION@
+Libs: -L${libdir} -l@PROJECT_NAME@
+Cflags: -I${includedir} -I${moduledir}

configure/template.pc

@@ -1,9 +1,12 @@
-# Get helper macros and functions
-include("${PROJECT_SOURCE_DIR}/cmake/helper.cmake")
-
 # Include Dependencies
-add_subdirectory(fplot)
 add_subdirectory(fortran_csv_module)
+include(FetchContent)
+FetchContent_Declare(
+    fplot
+    GIT_REPOSITORY "https://github.com/jchristopherson/fplot"
+)
+FetchContent_MakeAvailable(fplot)
+set(fplot_LIBRARY fplot)
 
 # Full Factorial Example
 add_executable(full_factorial_example full_factorial_example.f90)
@@ -30,56 +33,46 @@ configure_file(
 add_executable(allan_example allan_example.f90)
 target_link_libraries(allan_example fstats)
 target_link_libraries(allan_example ${fplot_LIBRARY})
-target_include_directories(allan_example PUBLIC ${fplot_INCLUDE_DIR})
 target_link_libraries(allan_example ${fortran-csv-module_LIBRARY})
 target_include_directories(allan_example PUBLIC ${fortran-csv-module_INCLUDE_DIR})
 
 # Box-Muller Example
 add_executable(box_muller_example box_muller_example.f90)
 target_link_libraries(box_muller_example fstats ${fplot_LIBRARY})
-target_include_directories(box_muller_example PUBLIC ${fplot_INCLUDE_DIR})
 
 # Rejection Sampling Example
 add_executable(rejection_sample_example rejection_sample_example.f90)
 target_link_libraries(rejection_sample_example fstats ${fplot_LIBRARY})
-target_include_directories(rejection_sample_example PUBLIC ${fplot_INCLUDE_DIR})
 
 # LOWESS Example
 add_executable(lowess_example lowess_example.f90)
 target_link_libraries(lowess_example fstats ${fplot_LIBRARY})
-target_include_directories(lowess_example PUBLIC ${fplot_INCLUDE_DIR})
 
 # Bootstrap Example
 add_executable(bootstrap_example bootstrap_example.f90)
 target_link_libraries(bootstrap_example fstats ${fplot_LIBRARY})
-target_include_directories(bootstrap_example PUBLIC ${fplot_INCLUDE_DIR})
 
 # MCMC Regression Example
 add_executable(mcmc_regression_example mcmc_regression_example.f90)
 target_link_libraries(mcmc_regression_example fstats)
 target_link_libraries(mcmc_regression_example ${fplot_LIBRARY})
-target_include_directories(mcmc_regression_example PUBLIC ${fplot_INCLUDE_DIR})
 
 # MCMC Regression Example 2
 add_executable(mcmc_regression_example_2 mcmc_regression_example_2.f90)
 target_link_libraries(mcmc_regression_example_2 fstats)
 target_link_libraries(mcmc_regression_example_2 ${fplot_LIBRARY})
-target_include_directories(mcmc_regression_example_2 PUBLIC ${fplot_INCLUDE_DIR})
 
 # MCMC Regression Example 3
 add_executable(mcmc_regression_example_3 mcmc_regression_example_3.f90)
 target_link_libraries(mcmc_regression_example_3 fstats)
 target_link_libraries(mcmc_regression_example_3 ${fplot_LIBRARY})
-target_include_directories(mcmc_regression_example_3 PUBLIC ${fplot_INCLUDE_DIR})
 
 # Distribution Example
 add_executable(distribution_example distribution_example.f90)
 target_link_libraries(distribution_example fstats)
 target_link_libraries(distribution_example ${fplot_LIBRARY})
-target_include_directories(distribution_example PUBLIC ${fplot_INCLUDE_DIR})
 
 # Interpolation Example
 add_executable(interpolation_example interpolation_example.f90)
 target_link_libraries(interpolation_example fstats)
 target_link_libraries(interpolation_example ${fplot_LIBRARY})
-target_include_directories(interpolation_example PUBLIC ${fplot_INCLUDE_DIR})