Mercurial > mxe-octave
comparison src/cmake.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 | 9d93b41c28f0 |
children | 293c86f0481e |
comparison
equal
deleted
inserted
replaced
5570:e50a3ed99da0 | 5571:b19fb3ed330c |
---|---|
31 define $(PKG)_BUILD | 31 define $(PKG)_BUILD |
32 mkdir '$(1).build' | 32 mkdir '$(1).build' |
33 cd '$(1).build' && cmake \ | 33 cd '$(1).build' && cmake \ |
34 $($(PKG)_CMAKE_OPTS) \ | 34 $($(PKG)_CMAKE_OPTS) \ |
35 $(CMAKE_CCACHE_FLAGS) \ | 35 $(CMAKE_CCACHE_FLAGS) \ |
36 $(CMAKE_BUILD_SHARED_OR_STATIC) \ | |
36 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ | 37 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ |
37 ../$($(PKG)_SUBDIR) | 38 ../$($(PKG)_SUBDIR) |
38 $(MAKE) -C '$(1).build' -j '$(JOBS)' | 39 $(MAKE) -C '$(1).build' -j '$(JOBS)' |
39 $(MAKE) -C '$(1).build' -j 1 install DESTDIR='$(3)' | 40 $(MAKE) -C '$(1).build' -j 1 install DESTDIR='$(3)' |
40 endef | 41 endef |