From c62a89434701f0875340366533c368dbbe535ff6 Mon Sep 17 00:00:00 2001
From: Emily Bourne <emily.bourne@epfl.ch>
Date: Wed, 21 Aug 2024 17:44:06 +0200
Subject: [PATCH 1/2] Correct CMake namespace to match documentation.
Correct the namespace added to the package in the CMake build-system installation. Instead of jsonfortran-<compiler_id> it is now simply jsonfortran.
---
packaging/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt
index e87a7075fa..bae3647c0b 100644
--- a/packaging/CMakeLists.txt
+++ b/packaging/CMakeLists.txt
@@ -1,5 +1,5 @@
install ( EXPORT ${PACKAGE_NAME}-targets
- NAMESPACE ${PACKAGE_NAME}::
+ NAMESPACE ${PROJECT_NAME}::
DESTINATION "${EXPORT_INSTALL_DIR}" )
include ( CMakePackageConfigHelpers ) # Standard CMake module
@@ -54,4 +54,4 @@ install(FILES
if(MSVC_IDE)
INCLUDE_DIRECTORIES("src")
SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fpp")
-endif()
\ No newline at end of file
+endif()
From 10352a8d623322533571921e787a92047ddfa00f Mon Sep 17 00:00:00 2001
From: Emily Bourne <emily.bourne@epfl.ch>
Date: Mon, 26 Aug 2024 09:05:16 +0200
Subject: [PATCH 2/2] Don't remove old library name (to prevent the
introduction of a breaking change). Create an alias for the new documented
library name
---
cmake/pkg/jsonfortran-config.cmake.in | 3 +++
packaging/CMakeLists.txt | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/cmake/pkg/jsonfortran-config.cmake.in b/cmake/pkg/jsonfortran-config.cmake.in
index 66fab64706..b7a1d51426 100644
--- a/cmake/pkg/jsonfortran-config.cmake.in
+++ b/cmake/pkg/jsonfortran-config.cmake.in
@@ -14,3 +14,6 @@ include ( "${@PACKAGE_NAME@_CONFIG_INSTALL_DIR}/@PACKAGE_NAME@-targets.cmake" )
# Make the module files available via include
set_and_check ( @PROJECT_NAME@_INCLUDE_DIRS "@PACKAGE_INSTALL_MOD_DIR@" )
+
+add_library(@PROJECT_NAME@::jsonfortran ALIAS @PACKAGE_NAME@::jsonfortran)
+add_library(@PROJECT_NAME@::jsonfortran-static ALIAS @PACKAGE_NAME@::jsonfortran-static)
diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt
index bae3647c0b..e87a7075fa 100644
--- a/packaging/CMakeLists.txt
+++ b/packaging/CMakeLists.txt
@@ -1,5 +1,5 @@
install ( EXPORT ${PACKAGE_NAME}-targets
- NAMESPACE ${PROJECT_NAME}::
+ NAMESPACE ${PACKAGE_NAME}::
DESTINATION "${EXPORT_INSTALL_DIR}" )
include ( CMakePackageConfigHelpers ) # Standard CMake module
@@ -54,4 +54,4 @@ install(FILES
if(MSVC_IDE)
INCLUDE_DIRECTORIES("src")
SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fpp")
-endif()
+endif()
\ No newline at end of file