Mercurial > mxe-octave
view src/armadillo-1-staticlib.patch @ 4590:5b5c47cd2111
Add file with hg id of MXE-Octave to dist package (bug #52794).
* tools/mk-hg-id.sh: New file copied (mostly) from Octave sources.
* Makefile.in: Call shell script, copy HG-ID in make dist
* binary-dist-rules.mk: Copy HG-ID to dist directory.
* dist-files.mk: add mk-hg-id.sh to dist files
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Wed, 03 Jan 2018 14:18:12 +0100 |
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)