view src/armadillo-1-staticlib.patch @ 4618:de2eedecd6ba

update broken PKG_UPDATE rules, handle missing update rules * Makefile.in: add handling for packages with no update rule * src/gtk2.mk, src/gtk3.mk, src/libvpx.mk, src/taglib.mk, src/hunspell.mk, src/vala.mk : use github tags for version info * src/llvm.mk: add '?' to update url * src/openscenegraph.mk: update SED rule for version extraction * src/pthread-stubs.mk, src/qt5.mk, src/renderproto.mk, src/sm.mk, src/s2tc.mk, src/util-macros.mk: added dummy PKG_UPDATE rule * src/qscintilla.mk: change search name for version extraction * src/qtbase.mk: use short pkg version in update path * src/suitesparse.mk: update change in main url/version url * src/tre.mk: update download page link * src/vmime.mk: update download and update url * src/wget.mk, src/xapian-core.mk: update url, sed rule * src/wt.mk: update to use github download/update * src/src-msys-libcrypt.mk: update sed rule
author John Donoghue
date Fri, 09 Mar 2018 11:46:42 -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)