Skip to content

Commit f2c096e

Browse files
committed
cmake >= 3.13 compatible
1 parent 2196784 commit f2c096e

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
cmake_minimum_required(VERSION 3.15)
1+
cmake_minimum_required(VERSION 3.13)
22

33
include(cmake/policy.cmake)
44
include(cmake/compiler_find.cmake)
55
find_c_fortran()
66

77
project(h5fortran
88
LANGUAGES C Fortran
9-
VERSION 3.4.6
9+
VERSION 3.4.8
1010
DESCRIPTION "thin, light object-oriented HDF5 Fortran interface"
1111
HOMEPAGE_URL https://github.com/geospace-code/h5fortran)
1212

cmake/Modules/FindHDF5.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,10 @@ if (i /= 0) error stop
256256
end")
257257
check_fortran_source_compiles(${_code} HDF5_Fortran_links SRC_EXT f90)
258258

259-
if(HDF5_Fortran_links)
259+
if(HDF5_Fortran_links AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.14)
260260
include(CheckFortranSourceRuns)
261261
check_fortran_source_runs(${_code} HDF5_runs SRC_EXT f90)
262-
endif(HDF5_Fortran_links)
262+
endif()
263263

264264
endif(HDF5_Fortran_FOUND)
265265

cmake/install.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/h5fortran.mod
66
# --- BOILERPLATE: install / packaging
77

88
install(TARGETS ${PROJECT_NAME}
9-
EXPORT ${PROJECT_NAME}Targets)
9+
EXPORT ${PROJECT_NAME}Targets
10+
ARCHIVE DESTINATION lib)
1011

1112
include(CMakePackageConfigHelpers)
1213

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project('h5fortran', 'fortran',
22
meson_version : '>=0.52.0',
3-
version : '3.4.5',
3+
version : '3.4.8',
44
default_options : ['default_library=static', 'buildtype=release', 'warning_level=3'])
55

66
subdir('meson')

0 commit comments

Comments
 (0)