Mercurial > mxe-octave

comparison src/gl2ps.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 ad50ef752299
comparison
equal deleted inserted replaced
5570:e50a3ed99da0 5571:b19fb3ed330c
27 ifeq ($(MXE_SYSTEM),msvc) 27 ifeq ($(MXE_SYSTEM),msvc)
28 define $(PKG)_BUILD 28 define $(PKG)_BUILD
29 cd '$(1)' && cmake \ 29 cd '$(1)' && cmake \
30 $($(PKG)_CMAKE_FLAGS) \ 30 $($(PKG)_CMAKE_FLAGS) \
31 $(CMAKE_CCACHE_FLAGS) \ 31 $(CMAKE_CCACHE_FLAGS) \
32 $(CMAKE_BUILD_SHARED_OR_STATIC) \
32 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ 33 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
33 -DPNG_NAMES=png16 \ 34 -DPNG_NAMES=png16 \
34 . 35 .
35 cd '$(1)' && env -u MAKE -u MAKEFLAGS nmake 36 cd '$(1)' && env -u MAKE -u MAKEFLAGS nmake
36 cd '$(1)' && env -u MAKE -u MAKEFLAGS nmake DESTDIR='$(3)' install 37 cd '$(1)' && env -u MAKE -u MAKEFLAGS nmake DESTDIR='$(3)' install
53 ifeq ($(MXE_SYSTEM),mingw) 54 ifeq ($(MXE_SYSTEM),mingw)
54 define $(PKG)_BUILD 55 define $(PKG)_BUILD
55 cd '$(1)' && cmake \ 56 cd '$(1)' && cmake \
56 $($(PKG)_CMAKE_FLAGS) \ 57 $($(PKG)_CMAKE_FLAGS) \
57 $(CMAKE_CCACHE_FLAGS) \ 58 $(CMAKE_CCACHE_FLAGS) \
59 $(CMAKE_BUILD_SHARED_OR_STATIC) \
58 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ 60 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
59 . 61 .
60 $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 62 $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1
61 63
62 # native mingw build doesnt want to install the files, even 64 # native mingw build doesnt want to install the files, even