Mercurial > mxe-octave
view src/armadillo-1-staticlib.patch @ 3306:2b4e9822f50b
Undo changeset 2ccb71581ee9, 70873001835f, 724c7c2201aa and create BUILD_TOOLS_PREFIX/bin
* src/pcre.mk: undo 724c7c2201aa and create BUILD_TOOLS_PREFIX/bin.
* src/libgpg-error.mk: Undo 70873001835f and create BUILD_TOOLS_PREFIX/bin.
* src/libgcrypt.mk: Undo ccb71581ee9 and create BUILD_TOOLS_PREFIX/bin.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sun, 10 Nov 2013 20:35:33 -0500 |
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)