Clean up

.github/workflows/fpm.yml

@@ -28,105 +28,18 @@ jobs:
         sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \
         --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \
         --slave /usr/bin/gcov gcov /usr/bin/gcov-${GCC_V}
-
-    - name: Install BLAS & LAPACK
-      if: contains(matrix.os, 'ubuntu')
-      run: |
-        sudo apt-get update
-        sudo apt-get install libopenblas-dev liblapack-dev
-
+
     - name: Install fpm
       uses: fortran-lang/setup-fpm@v5
       with:
         fpm-version: 'v0.10.1'
 
-    - name: Build LINALG
+    - name: Build FPLOT
       run: |
         gfortran --version
         fpm build
 
     - name: Run tests
       run: |
         gfortran --version
-        fpm test
-
-  msys2-build:
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW64
-          update: true
-          path-type: inherit
-          install: |
-            mingw-w64-x86_64-gcc-fortran
-            mingw-w64-x86_64-fpm
-            mingw-w64-x86_64-openblas
-            mingw-w64-x86_64-lapack
-
-      - name: fpm build
-        run: |
-          gfortran --version
-          fpm --version
-          fpm build
-
-      - name: fpm test
-        run: |
-          fpm test
-
-  # intel-build:
-  #   runs-on: ubuntu-latest
-  #   strategy:
-  #     fail-fast: false
-
-  #   env:
-  #     FPM_FC: ifx
-  #     FC: ifx
-
-  #   steps:
-  #   - name: Checkout code
-  #     uses: actions/checkout@v3
-
-  #   - name: Add Intel repository (Linux)
-  #     run: |
-  #       wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-  #       sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-  #       rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-  #       echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
-  #       sudo apt-get update
-
-  #   - name: Install Intel oneAPI compiler (Linux)
-  #     run: |
-  #       sudo apt-get install intel-oneapi-compiler-fortran
-
-  #   - name: Setup Intel oneAPI environment
-  #     run: |
-  #       source /opt/intel/oneapi/setvars.sh
-  #       printenv >> $GITHUB_ENV
-
-  #   - name: Install MKL
-  #     run: |
-  #       sudo apt-get update
-  #       sudo apt-get -y install intel-mkl
-  #       sudo apt update
-  #       sudo apt -y install intel-mkl
-
-  #   - name: Install fpm
-  #     uses: fortran-lang/setup-fpm@v3
-  #     with:
-  #       fpm-version: 'v0.8.2'
-
-  #   - name: fpm build
-  #     run: |
-  #       ifx --version
-  #       fpm --version
-  #       fpm build --profile debug --flag "-warn nointerfaces"
-
-  #   - name: fpm test
-  #     run: |
-  #       fpm test --profile debug --flag "-warn nointerfaces"
+        fpm test

CMakeLists.txt

@@ -3,53 +3,34 @@ cmake_minimum_required(VERSION 3.24)
 project(
     fplot 
     LANGUAGES Fortran
-    VERSION 1.8.0
+    VERSION 1.8.1
 )
 
-# Get helper macros and functions
-include("${PROJECT_SOURCE_DIR}/cmake/helper.cmake")
-
 # Confgiure everything
 add_subdirectory(configure)
 
-# Locate Dependencies
-add_subdirectory(dependencies)
-
 # Source
 add_subdirectory(src)
-add_fortran_library(
-    ${PROJECT_NAME}
-    ${PROJECT_INCLUDE_DIR}
-    ${CMAKE_INSTALL_INCLUDEDIR}
-    ${PROJECT_VERSION}
-    ${PROJECT_VERSION_MAJOR}
-    ${FPLOT_SOURCES}
-)
-link_library(${PROJECT_NAME} ${ferror_LIBRARY} ${ferror_INCLUDE_DIR})
-link_library(${PROJECT_NAME} ${fstring_LIBRARY} ${fstring_INCLUDE_DIR})
-link_library(${PROJECT_NAME} ${collections_LIBRARY} ${collections_INCLUDE_DIR})
-link_library(${PROJECT_NAME} ${geompack_LIBRARY} ${geompack_INCLUDE_DIR})
-link_library(${PROJECT_NAME} ${forcolormap_LIBRARY} ${forcolormap_INCLUDE_DIR})
 
-# ------------------------------------------------------------------------------
-# EXAMPLES
-# ------------------------------------------------------------------------------
-option(BUILD_FPLOT_EXAMPLES "Build FPLOT examples?" OFF)
-if (BUILD_FPLOT_EXAMPLES)
-    # Inform the user we're building the examples
-    message(STATUS "Building FPLOT examples.")
-
-    # Build the examples
-    add_subdirectory(examples)
-endif()
+# Install
+install(
+  EXPORT ${PROJECT_NAME}-targets
+  NAMESPACE ${PROJECT_NAME}::
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
+)
 
-# ------------------------------------------------------------------------------
-# TESTING
-# ------------------------------------------------------------------------------
+# Testing
 option(BUILD_TESTING "Build tests")
 include(CTest)
-message(STATUS "Build tests: ${BUILD_TESTING}")
+message(STATUS "Build FPLOT tests: ${BUILD_TESTING}")
 if (BUILD_TESTING)
     enable_testing()
     add_subdirectory(test)
+endif()
+
+# Examples
+option(BUILD_FPLOT_EXAMPLES "Build FPLOT examples")
+message(STATUS "Build FPLOT examples: ${BUILD_FPLOT_EXAMPLES}")
+if (BUILD_FPLOT_EXAMPLES)
+    add_subdirectory(examples)
 endif()

configure/CMakeLists.txt

@@ -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/template.cmake

@@ -0,0 +1,5 @@
+@PACKAGE_INIT@
+
+if(NOT TARGET "@PROJECT_NAME@::@PROJECT_NAME@")
+  include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake")
+endif()

configure/template.pc

@@ -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}