Mercurial > mxe-octave
view src/armadillo-1-staticlib.patch @ 3926:ee802fc5dd9b
gcc: update to 5.1.0, update isl, libgpg_error
* src/build-gcc.mk: update version, checksum, remove cloog as a dependancy
* src/gcc-isl-1-fixes.patch: remove patch
* src/isl-1-fixes.patch: update patch
* src/isl.mk: update version, checksum
* src/libgpg_error-1-fixes.patch: remove patch
* src/libgpg_error.mk: update version, checksum
* src/native-gcc.mk: update version, checksum, remove cloog as a dependancy
* dist-files.mk: remove gcc-isl-1-fixes.patch, libgpg_error-1-fixes.patch
| author | John D |
|---|---|
| date | Sun, 03 May 2015 20:38:29 -0400 |
| 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)