Merge branch 'master' of https://github.com/jacobwilliams/json-fortran into speed

Author: jacobwilliams

.github/workflows/CI.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
 
@@ -11,7 +11,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         gcc_v: [7,8,9,10] # Version of GFortran we want to use.
-        python-version: [3.7]
+        python-version: [3.9]
     env:
       FC: gfortran-${{matrix.gcc_v}}
       GCC_V: ${{matrix.gcc_v}}

CMakeLists.txt

@@ -177,6 +177,14 @@ if(JSON_FORTRAN_USE_OpenCoarrays)
     PRIVATE OpenCoarrays::caf_mpi_static)
 endif()
 
+target_include_directories(${LIB_NAME}
+  PUBLIC
+  $<BUILD_INTERFACE:${MODULE_DIR}>
+  $<INSTALL_INTERFACE:${INSTALL_MOD_DIR}>)
+target_include_directories(${LIB_NAME}-static
+  PUBLIC
+  $<BUILD_INTERFACE:${MODULE_DIR}>
+  $<INSTALL_INTERFACE:${INSTALL_MOD_DIR}>)
 set_target_properties ( ${LIB_NAME}-static
   PROPERTIES
   OUTPUT_NAME ${LIB_NAME}
@@ -438,7 +446,9 @@ add_custom_target ( uninstall
 #-----------------------------------------------------
 # Publicize installed location to other CMake projects
 #-----------------------------------------------------
-install ( EXPORT ${PACKAGE_NAME}-targets DESTINATION "${EXPORT_INSTALL_DIR}" )
+install ( EXPORT ${PACKAGE_NAME}-targets
+  NAMESPACE ${PACKAGE_NAME}::
+  DESTINATION "${EXPORT_INSTALL_DIR}" )
 
 include ( CMakePackageConfigHelpers ) # Standard CMake module
 write_basic_package_version_file( "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-version.cmake"

README.md

@@ -42,6 +42,7 @@ Download
 
 [![GitHub release](https://img.shields.io/github/release/jacobwilliams/json-fortran.svg?style=plastic)](https://github.com/jacobwilliams/json-fortran/releases)
 [![homebrew version](https://img.shields.io/homebrew/v/json-fortran.svg?style=plastic)](https://formulae.brew.sh/formula/json-fortran)
+[![Conda (channel only)](https://img.shields.io/conda/vn/conda-forge/json-fortran?style=plastic)](https://github.com/conda-forge/json-fortran-feedstock)
 
 Download the official versioned releases
 [here](https://github.com/jacobwilliams/json-fortran/releases/latest).
@@ -67,6 +68,21 @@ multiple Fortran compilers, please follow the CMake installation
 instructions below, as the homebrew installation is only intended to
 support a single Fortran compiler. Cheers!
 
+__NEWS:__ As of January 20, 2022,
+[json-fortran](https://github.com/jacobwilliams/json-fortran) can be
+downloaded and installed via the [conda](https://docs.conda.io/en/latest/)
+package manager on Mac OS X and Linux. Once a conda-distribution, like
+[miniforge](https://github.com/conda-forge/miniforge), is installed
+the [json-fortran package](https://anaconda.org/conda-forge/json-fortran)
+can be installed.
+
+```bash
+conda install json-fortran
+```
+
+_Note:_ Packages on conda-forge are build with GCC 9.4 which is upwards
+compatible with newer GCC versions, but not with other Fortran compilers.
+
 [top](#json-fortran)
 
 Building the library
@@ -122,15 +138,14 @@ enable_language ( Fortran )
 project ( jf_test NONE )
 
 find_package ( jsonfortran-${CMAKE_Fortran_COMPILER_ID} 8.2.5 REQUIRED )
-include_directories ( "${jsonfortran_INCLUDE_DIRS}" )
 
 file ( GLOB JF_TEST_SRCS "src/tests/jf_test_*.F90" )
 foreach ( UNIT_TEST ${JF_TEST_SRCS} )
   get_filename_component ( TEST ${UNIT_TEST} NAME_WE )
   add_executable ( ${TEST} ${UNIT_TEST} )
-  target_link_libraries ( ${TEST} jsonfortran-static )
+  target_link_libraries ( ${TEST} jsonfortran::jsonfortran-static )
   # or for linking against the dynamic/shared library:
-  # target_link_libraries ( ${TEST} jsonfortran ) # instead
+  # target_link_libraries ( ${TEST} jsonfortran::jsonfortran ) # instead
 endforeach()
 ```
 

pages/development-resources/release-checklist.md

@@ -53,8 +53,8 @@ remain accurate.
  1. Update the version string in remaining files requiring manual edits:
      1. Edit the `.VERSION` file
      1. Edit the CMake example on line 124 of `README.md`
-	 1. Add both files to the git index: `git add .VERSION
-     README.md`
+     1. Edit the `json_fortran_version` string in `json_module.F90`
+	 1. Add these files to the git index: `git add .VERSION README.md ./src/json_module.F90`
  1. Commit the changes to the master branch: `git commit`
  1. Create the tag: `git tag <new version>`
      1. Note: for some reason, using GitHub to tag a project means that the tag doesn't show up when you `git describe` the project. Tagging from the command line makes `git describe` work as expected.

src/json_module.F90

@@ -73,6 +73,12 @@ module json_module
 
     implicit none
 
+    character(kind=json_CK,len=5),protected :: json_fortran_version = '8.2.5'
+        !! JSON-Fortran version.
+        !!
+        !!@note This string should match the one in the `.VERSION` file (which is used
+        !! for the documentation generation.)
+
     public
 
     end module json_module

src/json_value_module.F90

@@ -7987,7 +7987,7 @@ subroutine add_to_path(str,path_sep)
         !! prepend the string to the path
         implicit none
         character(kind=CK,len=*),intent(in) :: str  !! string to prepend to `path`
-        character(kind=CK,len=1),intent(in),optional :: path_sep
+        character(kind=CK,len=*),intent(in),optional :: path_sep
             !! path separator (default is '.').
             !! (ignored if `json%path_mode/=1`)
 

src/tests/jf_test_01.F90

@@ -57,6 +57,8 @@ subroutine test_1(error_cnt)
     write(error_unit,'(A)') '================================='
     write(error_unit,'(A)') ''
 
+    write(error_unit,'(A)') 'JSON-Fortran version: '//json_fortran_version
+
     ! parse the json file:
     write(error_unit,'(A)') ''
     write(error_unit,'(A)') 'parsing file '//dir//filename1