Mercurial > mxe-octave
view src/armadillo-1-staticlib.patch @ 5499:be0a7ce498e6
Update mesa to version 20.0.8 (bug #58689).
* src/mesa.mk: Update version and checksum. Add build-meson to dependecies.
Update build rule to use meson and ninja as the build tools.
* src/mesa-1-meson.patch: Add new patch.
* src/mesa-1-fixes.patch: Remove old patch for the scons rule that is no longer
needed.
* dist-files.mk: Update file list.
* src/build-mako.mk: Depend on and use python3.
* src/build-markupsafe.mk: Depend on and use python3.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sun, 05 Jul 2020 20:58:57 +0200 |
parents | 603f5be8a550 |
children |
line wrap: on
line source
This file is part of MXE. See index.html for further information. diff -urN a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt 2012-09-14 16:43:20.000000000 +0200 +++ b/CMakeLists.txt 2012-09-20 20:39:05.073039124 +0200 @@ -40,7 +40,7 @@ set(ARMA_USE_ATLAS false) set(ARMA_USE_BOOST false) set(ARMA_USE_HDF5 false) -set(ARMA_USE_WRAPPER true ) # set this to false if you prefer to directly link with LAPACK and/or BLAS (eg. -llapack -lblas) instead of -larmadillo +set(ARMA_USE_WRAPPER false ) # set this to false if you prefer to directly link with LAPACK and/or BLAS (eg. -llapack -lblas) instead of -larmadillo if(WIN32) @@ -263,7 +263,7 @@ #set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -add_library( armadillo SHARED src/wrap_libs ) +add_library( armadillo STATIC src/wrap_libs ) target_link_libraries( armadillo ${ARMA_LIBS} ) set_target_properties(armadillo PROPERTIES VERSION ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH} SOVERSION 3)