diff src/hdf5.mk @ 5571:b19fb3ed330c

use cmake command line to set build shared/static options (bug #59373) * Makefile.in (CMAKE_BUILD_SHARED_OR_STATIC): New variable. (build-cmake-toolchain-file): Don't define BUILD_SHARED_LIBS or BUILD_STATIC_LIBS in the toolchain file. * armadillo.mk, cgal.mk, cmake.mk, cminpack.mk, double-conversion.mk, eigen.mk, gdcm.mk, gl2ps.mk, hdf5.mk, lapack.mk, libical.mk, libproxy.mk, of-dicom.mk, openal.mk, opencv.mk, openexr.mk, openscenegraph.mk, physfs.mk, qhull.mk, qjson.mk, rapidjson.mk, suitesparse.mk, sundials-ida.mk, taglib.mk, vigra.mk, vmime.mk, vtk.mk, wt.mk: Use $(CMAKE_BUILD_SHARED_OR_STATIC) on the cmake command line.
author John W. Eaton <jwe@octave.org>
date Fri, 30 Oct 2020 10:06:00 -0400
parents d862fd40cc42
children de66eba9951c
line wrap: on
line diff
--- a/src/hdf5.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/hdf5.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -62,8 +62,8 @@
     cd '$(1)/.build' && cmake .. -G "Unix Makefiles" \
         -DCMAKE_INSTALL_PREFIX=${prefix} \
         $($(PKG)_CMAKE_FLAGS) \
-        -DBUILD_SHARED_LIBS=$(if $(findstring yes,$(BUILD_SHARED)),ON,OFF) \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DHDF5_INSTALL_BIN_DIR='$(HOST_BINDIR)' \
         -DHDF5_INSTALL_LIB_DIR='$(HOST_LIBDIR)' \