Mercurial > mxe-octave

comparison src/suitesparse.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 59871eac3409
comparison
equal deleted inserted replaced
5570:e50a3ed99da0 5571:b19fb3ed330c
56 AR='$(MXE_AR)' \ 56 AR='$(MXE_AR)' \
57 RANLIB='$(MXE_RANLIB)' \ 57 RANLIB='$(MXE_RANLIB)' \
58 BLAS="-lblas -lgfortran" \ 58 BLAS="-lblas -lgfortran" \
59 LAPACK='-llapack' \ 59 LAPACK='-llapack' \
60 CHOLMOD_CONFIG='-DNPARTITION' \ 60 CHOLMOD_CONFIG='-DNPARTITION' \
61 CMAKE_OPTIONS='-DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" $(CMAKE_CCACHE_FLAGS)' 61 CMAKE_OPTIONS='-DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" $(CMAKE_CCACHE_FLAGS) $(CMAKE_BUILD_SHARED_OR_STATIC)'
62 62
63 ifeq ($(MXE_WINDOWS_BUILD),yes) 63 ifeq ($(MXE_WINDOWS_BUILD),yes)
64 $(PKG)_MAKE_OPTS += \ 64 $(PKG)_MAKE_OPTS += \
65 UNAME=Windows 65 UNAME=Windows
66 $(PKG)_SO_DIR := $($(PKG)_DESTDIR)$(HOST_BINDIR) 66 $(PKG)_SO_DIR := $($(PKG)_DESTDIR)$(HOST_BINDIR)
80 # build metis 80 # build metis
81 mkdir $(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR) 81 mkdir $(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR)
82 cd $(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR) && \ 82 cd $(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR) && \
83 cmake $(1)/metis-5.1.0 \ 83 cmake $(1)/metis-5.1.0 \
84 $(CMAKE_CCACHE_FLAGS) \ 84 $(CMAKE_CCACHE_FLAGS) \
85 $(CMAKE_BUILD_SHARED_OR_STATIC) \
85 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ 86 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
86 $($(PKG)_METIS_CONFIG_FLAGS) 87 $($(PKG)_METIS_CONFIG_FLAGS)
87 $(MAKE) -C '$(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR)' metis -j '$(JOBS)' 88 $(MAKE) -C '$(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR)' metis -j '$(JOBS)'
88 89
89 # install metis 90 # install metis