From f33c7a19c8f7e82499e249b4feeb0f43ee32b04e Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Mon, 26 Oct 2020 17:19:58 -0400 Subject: [PATCH] dedupe hdf5_external specification --- CMakeLists.txt | 2 +- cmake/build_hdf5.cmake | 2 ++ cmake/hdf5.cmake | 2 -- meson.build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3045f712..9595c194 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ endif() project(h5fortran LANGUAGES C Fortran - VERSION 3.3.6 + VERSION 3.3.7 DESCRIPTION "thin, light object-oriented HDF5 Fortran interface" HOMEPAGE_URL https://github.com/geospace-code/h5fortran) diff --git a/cmake/build_hdf5.cmake b/cmake/build_hdf5.cmake index fc05c144..a5980dcc 100644 --- a/cmake/build_hdf5.cmake +++ b/cmake/build_hdf5.cmake @@ -2,6 +2,8 @@ # note: the use of "lib" vs. CMAKE_STATIC_LIBRARY_PREFIX is deliberate based on the particulars of these libraries # across Intel Fortran on Windows vs. Gfortran on Windows vs. Linux. +set(hdf5_external true CACHE BOOL "autobuild HDF5") + include(ExternalProject) set(HDF5_LIBRARIES) diff --git a/cmake/hdf5.cmake b/cmake/hdf5.cmake index 45bf1a14..9bc64830 100644 --- a/cmake/hdf5.cmake +++ b/cmake/hdf5.cmake @@ -22,7 +22,6 @@ if(NOT hdf5_external) endif() if(NOT HDF5_FOUND) - set(hdf5_external true CACHE BOOL "autobuild HDF5") include(${CMAKE_CURRENT_LIST_DIR}/build_hdf5.cmake) return() endif() @@ -147,6 +146,5 @@ else() unset(HDF5_DEFINITIONS) unset(ZLIB::ZLIB) unset(SZIP::SZIP) - set(hdf5_external true CACHE BOOL "autobuild HDF5") include(${CMAKE_CURRENT_LIST_DIR}/build_hdf5.cmake) endif() diff --git a/meson.build b/meson.build index aab4dfba..0cd098cc 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('h5fortran', 'fortran', meson_version : '>=0.52.0', - version : '3.3.6', + version : '3.3.7', default_options : ['default_library=static', 'buildtype=release', 'warning_level=3']) subdir('meson')