Mercurial > mxe-octave

comparison src/qhull.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 8279e6b94a0b
comparison
equal deleted inserted replaced
5570:e50a3ed99da0 5571:b19fb3ed330c
26 define $(PKG)_BUILD 26 define $(PKG)_BUILD
27 mkdir '$(1)/../.build' 27 mkdir '$(1)/../.build'
28 cd '$(1)/../.build' && cmake \ 28 cd '$(1)/../.build' && cmake \
29 $($(PKG)_CMAKE_OPTS) \ 29 $($(PKG)_CMAKE_OPTS) \
30 $(CMAKE_CCACHE_FLAGS) \ 30 $(CMAKE_CCACHE_FLAGS) \
31 $(CMAKE_BUILD_SHARED_OR_STATIC) \
31 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ 32 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
32 -DDOC_INSTALL_DIR='$(1)' \ 33 -DDOC_INSTALL_DIR='$(1)' \
33 ../$($(PKG)_SUBDIR) 34 ../$($(PKG)_SUBDIR)
34 make -C $(1)/../.build -j $(JOBS) 35 make -C $(1)/../.build -j $(JOBS)
35 make -C $(1)/../.build -j 1 install DESTDIR=$(3) 36 make -C $(1)/../.build -j 1 install DESTDIR=$(3)