Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

restore old default behavior in cmake #559

Merged
merged 3 commits into from
May 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.5.0
8.5.1
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- [Change Log](#change-log)
- [Unreleased](#unreleased)
- [8.5.1 (2024-05-26)](#851-2024-05-26)
- [8.5.0 (2024-05-25)](#850-2024-05-25)
- [8.4.0 (2024-03-06)](#840-2024-03-06)
- [8.3.0 (2022-05-07)](#830-2022-05-07)
Expand Down Expand Up @@ -47,7 +48,16 @@

### [Unreleased](https://github.com/jacobwilliams/json-fortran/tree/HEAD)

[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/8.5.0...HEAD)
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/8.5.1...HEAD)

### [8.5.1](https://github.com/jacobwilliams/json-fortran/tree/8.5.1) (2024-05-26)

[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/8.5.0...8.5.1)
or [Download v8.5.1](https://github.com/jacobwilliams/json-fortran/releases/tag/8.5.1)

**Bug Fixes:**

* Fixed a bug when setting `JSONFORTRAN_STATIC_LIBRARY_ONLY` to False. Also restored some of the original CMake settings from 8.4.0. Specifically, the tests are enabled by default, and both the shared and static libraries are built by default. [#558](https://github.com/jacobwilliams/json-fortran/issues/558) [#559](https://github.com/jacobwilliams/json-fortran/pull/559) ([jacobwilliams](https://github.com/jacobwilliams))

### [8.5.0](https://github.com/jacobwilliams/json-fortran/tree/8.5.0) (2024-05-25)

Expand Down
7 changes: 4 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
cmake_minimum_required ( VERSION 3.18 FATAL_ERROR )

option (JSONFORTRAN_ENABLE_DOC_GENERATION "Enable doc generation" OFF)
option (JSONFORTRAN_ENABLE_TESTS "Enable tests" OFF)
option (JSONFORTRAN_STATIC_LIBRARY_ONLY "Generate only static library" ON)
option (JSONFORTRAN_ENABLE_TESTS "Enable tests" ON)
option (JSONFORTRAN_STATIC_LIBRARY_ONLY "Generate only static library" OFF)

# Use MSVS folders to organize projects on windows
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
Expand All @@ -40,7 +40,7 @@ include ( "cmake/checkOutOfSource.cmake" )
#---------------------
project (
jsonfortran
VERSION 8.5.0
VERSION 8.5.1
LANGUAGES Fortran
)

Expand Down Expand Up @@ -180,6 +180,7 @@ else()
add_library ( ${LIB_NAME}-static STATIC ${JF_LIB_SRCS} )
else()
add_library ( ${LIB_NAME} SHARED ${JF_LIB_SRCS} )
add_library ( ${LIB_NAME}-static STATIC ${JF_LIB_SRCS} )
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ cmake_minimum_required ( VERSION 3.18 FATAL_ERROR )
enable_language ( Fortran )
project ( jf_test NONE )

find_package ( jsonfortran-${CMAKE_Fortran_COMPILER_ID} 8.5.0 REQUIRED )
find_package ( jsonfortran-${CMAKE_Fortran_COMPILER_ID} 8.5.1 REQUIRED )

file ( GLOB JF_TEST_SRCS "src/tests/jf_test_*.F90" )
foreach ( UNIT_TEST ${JF_TEST_SRCS} )
Expand Down
3 changes: 3 additions & 0 deletions pages/releases/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ documentation from the documentation for official releases other than
using the browser's back button. Feel free to bookmark this page, or
the [main project page](|url|/index.html) for convenient navigation.

* [8.5.1](https://jacobwilliams.github.io/json-fortran/prev/8.5.1/index.html)
([FORD](https://github.com/Fortran-FOSS-Programmers/ford) generated documentation)
- [Download](https://github.com/jacobwilliams/json-fortran/releases/tag/8.5.1)
* [8.5.0](https://jacobwilliams.github.io/json-fortran/prev/8.5.0/index.html)
([FORD](https://github.com/Fortran-FOSS-Programmers/ford) generated documentation)
- [Download](https://github.com/jacobwilliams/json-fortran/releases/tag/8.5.0)
Expand Down
2 changes: 1 addition & 1 deletion src/json_module.F90
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ module json_module

implicit none

character(kind=json_CK,len=*),parameter,private :: version = '8.5.0'
character(kind=json_CK,len=*),parameter,private :: version = '8.5.1'
!! JSON-Fortran version.
!!
!!@note This string should match the one in the `.VERSION` file (which is used
Expand Down