Mercurial > mxe-octave

comparison src/openexr.mk @ 5571:b19fb3ed330c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d8cda0e30e45
comparison
equal deleted inserted replaced
5570:e50a3ed99da0 5571:b19fb3ed330c
19 ifeq ($(MXE_NATIVE_BUILD),yes) 19 ifeq ($(MXE_NATIVE_BUILD),yes)
20 define $(PKG)_BUILD 20 define $(PKG)_BUILD
21 mkdir '$(1)/build' 21 mkdir '$(1)/build'
22 cd '$(1)/build' && cmake .. \ 22 cd '$(1)/build' && cmake .. \
23 $(CMAKE_CCACHE_FLAGS) \ 23 $(CMAKE_CCACHE_FLAGS) \
24 $(CMAKE_BUILD_SHARED_OR_STATIC) \
24 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ 25 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
25 -DBUILD_TESTING='OFF' \ 26 -DBUILD_TESTING='OFF' \
26 -DINSTALL_OPENEXR_DOCS='OFF' \ 27 -DINSTALL_OPENEXR_DOCS='OFF' \
27 -DINSTALL_OPENEXR_EXAMPLES='OFF' \ 28 -DINSTALL_OPENEXR_EXAMPLES='OFF' \
28 -DOPENEXR_BUILD_UTILS='OFF' \ 29 -DOPENEXR_BUILD_UTILS='OFF' \
35 else 36 else
36 define $(PKG)_BUILD 37 define $(PKG)_BUILD
37 mkdir '$(1)/build' 38 mkdir '$(1)/build'
38 cd '$(1)/build' && cmake .. \ 39 cd '$(1)/build' && cmake .. \
39 $(CMAKE_CCACHE_FLAGS) \ 40 $(CMAKE_CCACHE_FLAGS) \
41 $(CMAKE_BUILD_SHARED_OR_STATIC) \
40 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ 42 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
41 -DBUILD_TESTING='OFF' \ 43 -DBUILD_TESTING='OFF' \
42 -DCMAKE_VERBOSE_MAKEFILE='ON' \ 44 -DCMAKE_VERBOSE_MAKEFILE='ON' \
43 -DPYILMBASE_ENABLE='OFF' \ 45 -DPYILMBASE_ENABLE='OFF' \
44 -DINSTALL_OPENEXR_DOCS='OFF' \ 46 -DINSTALL_OPENEXR_DOCS='OFF' \