Mercurial > mxe-octave

diff src/suitesparse.mk @ 5541:d862fd40cc42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use ccache for packages built with cmake. * Makefile.in: New variable CMAKE_CCACHE_FLAGS. * src/armadillo.mk, src/cgal.mk, src/cmake.mk, src/cminpack, src/double-conversion.mk, src/eigen.mk, src/gdcm.mk, src/gl2ps.mk, src/hdf5.mk, src/lapack.mk, src/libical.mk, src/libproxy, src/llvm.mk, src/of-dicom.mk, src/openal.mk, src/opencv.mk, src/openexr.mk, src/openscenegraph.mk, src/physfs.mk, src/qhull.mk, src/qjson.mk, src/rapidjson.mk, src/suitesparse.mk, src/sundials-ida.mk, src/taglib.mk, src/vigra.mk, src/vmime.mk, src/vtk.mk, src/wt.mk: Add new variable to cmake flags. Harmonize indentation in files.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 20 Sep 2020 11:57:01 +0200
parents 5191e4789168
children b19fb3ed330c
line wrap: on
line diff
--- a/src/suitesparse.mk	Sat Sep 19 17:35:15 2020 +0200
+++ b/src/suitesparse.mk	Sun Sep 20 11:57:01 2020 +0200
@@ -40,9 +40,6 @@
         CXX='$(CCACHE) $(MXE_CXX)' \
         CPLUSPLUS='$(CCACHE) $(MXE_CXX)' \
         F77='$(CCACHE) $(MXE_F77)'
-    $(PKG)_CMAKE_CCACHE_OPTS := -DCMAKE_CXX_COMPILER_LAUNCHER='$(CCACHE)' \
-        -DCMAKE_C_COMPILER_LAUNCHER='$(CCACHE)' \
-        -DCMAKE_Fortran_COMPILER_LAUNCHER='$(CCACHE)'
 else
     $(PKG)_COMPILER_OPTS := CC='$(MXE_CC)' \
         CXX='$(MXE_CXX)' \
@@ -61,7 +58,7 @@
     BLAS="-lblas -lgfortran" \
     LAPACK='-llapack' \
     CHOLMOD_CONFIG='-DNPARTITION' \
-    CMAKE_OPTIONS='-DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" $($(PKG)_CMAKE_CCACHE_OPTS)'
+    CMAKE_OPTIONS='-DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" $(CMAKE_CCACHE_FLAGS)'
 
 ifeq ($(MXE_WINDOWS_BUILD),yes)
     $(PKG)_MAKE_OPTS += \
@@ -77,14 +74,14 @@
 $(PKG)_METIS_CONFIG_FLAGS = -DCMAKE_VERBOSE_MAKEFILE=1 \
     -DGKLIB_PATH=$(1)/metis-5.1.0/GKlib \
     -DCMAKE_INSTALL_PREFIX=$(1) \
-    -DSHARED=1 \
-    $($(PKG)_CMAKE_CCACHE_OPTS)
+    -DSHARED=1
 
 define $(PKG)_BUILD
     # build metis
     mkdir $(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR)
     cd $(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR) && \
         cmake $(1)/metis-5.1.0 \
+            $(CMAKE_CCACHE_FLAGS) \
             -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
             $($(PKG)_METIS_CONFIG_FLAGS)
     $(MAKE) -C '$(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR)' metis -j '$(JOBS)'