dedupe hdf5_external specification

geospace-code · Oct 26, 2020 · f33c7a1 · f33c7a1
1 parent 3fc0e25
commit f33c7a1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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')