diff --git a/CMakeLists.txt b/CMakeLists.txt index 9334770..49ac637 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.24) project( fstats LANGUAGES Fortran - VERSION 1.1.2 + VERSION 1.1.3 ) # Get helper macros and functions @@ -28,9 +28,6 @@ add_fortran_library( link_library(${PROJECT_NAME} ${ferror_LIBRARY} ${ferror_INCLUDE_DIR}) link_library(${PROJECT_NAME} ${linalg_LIBRARY} ${linalg_INCLUDE_DIR}) -# Installation -add_subdirectory(install) - # Testing option(BUILD_TESTING "Build tests") include(CTest) diff --git a/fpm.toml b/fpm.toml index 24b9086..2fde502 100644 --- a/fpm.toml +++ b/fpm.toml @@ -1,9 +1,9 @@ name = "fstats" -version = "1.1.2" +version = "1.1.3" license = "GPL-3.0" author = "Jason Christopherson" maintainer = "Jason Christopherson" -copyright = "Copyright 2022-2023, Jason Christopherson" +copyright = "Copyright 2022-2024, Jason Christopherson" description = "A modern Fortran statistical library." homepage = "https://github.com/jchristopherson/fstats" diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt deleted file mode 100644 index 2fd95f6..0000000 --- a/install/CMakeLists.txt +++ /dev/null @@ -1,59 +0,0 @@ -# Get the macros and functions we'll need -include("${PROJECT_SOURCE_DIR}/cmake/helper.cmake") -include(CMakePackageConfigHelpers) - -# Install the library and necessary include files -install_library( - ${PROJECT_NAME} - ${CMAKE_INSTALL_LIBDIR} - ${CMAKE_INSTALL_BINDIR} - ${PROJECT_INCLUDE_DIR} - ${CMAKE_INSTALL_PREFIX} -) - -# Install the documentation files -install_documentation( - ${PROJECT_SOURCE_DIR}/doc/html - ${CMAKE_INSTALL_PREFIX}/doc -) - -# Define the version file -write_basic_package_version_file( - ${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake - VERSION ${PROJECT_VERSION} - COMPATIBILITY AnyNewerVersion -) - -export( - EXPORT ${PROJECT_NAME}Targets - FILE ${CMAKE_BINARY_DIR}/${PROJECT_NAME}Targets.cmake -) - -# Define the configuration file -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in - ${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake - COPYONLY -) - -install( - EXPORT ${PROJECT_NAME}Targets - FILE ${PROJECT_NAME}Targets.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -) -install( - FILES - ${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake - ${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -) - -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 -) \ No newline at end of file diff --git a/install/fstatsConfig.cmake.in b/install/fstatsConfig.cmake.in deleted file mode 100644 index 85b34f4..0000000 --- a/install/fstatsConfig.cmake.in +++ /dev/null @@ -1,3 +0,0 @@ -if (NOT TARGET fstats) - include("${CMAKE_CURRENT_LIST_DIR}/fstatsTargets.cmake") -endif() \ No newline at end of file diff --git a/install/template.pc b/install/template.pc deleted file mode 100644 index 6aff10d..0000000 --- a/install/template.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix = @CMAKE_INSTALL_PREFIX@ -libdir = ${prefix}/@CMAKE_INSTALL_FULL_LIBDIR@ -includedir = ${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ - -Name: @PROJECT_NAME@ -Description: FSTATS is a modern Fortran statistical library. -Version: @PROJECT_VERSION@ -URL: https://github.com/jchristopherson/fstats -Libs: -L${libdir} -l@PROJECT_NAME@ -Cflags: -I${includedir} \ No newline at end of file