Mercurial > mxe-octave
comparison src/armadillo.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 |
comparison
equal
deleted
inserted
replaced
| 5570:e50a3ed99da0 | 5571:b19fb3ed330c |
|---|---|
| 18 endef | 18 endef |
| 19 | 19 |
| 20 define $(PKG)_BUILD | 20 define $(PKG)_BUILD |
| 21 cd '$(1)' && cmake . \ | 21 cd '$(1)' && cmake . \ |
| 22 $(CMAKE_CCACHE_FLAGS) \ | 22 $(CMAKE_CCACHE_FLAGS) \ |
| 23 $(CMAKE_BUILD_SHARED_OR_STATIC) \ | |
| 23 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' | 24 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' |
| 24 $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 | 25 $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 |
| 25 | 26 |
| 26 # note: don't use -Werror with GCC 4.7.0 and .1 | 27 # note: don't use -Werror with GCC 4.7.0 and .1 |
| 27 '$(MXE_CXX)' \ | 28 '$(MXE_CXX)' \ |