Mercurial > mxe-octave
view src/armadillo-1-staticlib.patch @ 4449:1933a9113e65
of-*: add octave as a dependancy to the of packages is binary enable is set (Bug #46235)
* src/of-actuarial.mk, src/of-communications.mk, src/of-control.mk, src/of-data-smoothing.mk,
src/of-database.mk, src/of-dataframe.mk, src/of-dicom.mk, src/of-financial.mk, src/of-fits.mk,
src/of-fl-core.mk, src/of-fuzzy-logic-toolkit.mk, src/of-ga.mk, src/of-general.mk, src/of-generate_html.mk,
src/of-geometry.mk, src/of-gsl.mk, src/of-image.mk, src/of-instrument-control.mk, src/of-interval.mk,
src/of-io.mk, src/of-linear-algebra.mk, src/of-lssa.mk, src/of-ltfat.mk, src/of-mapping.mk,
src/of-miscellaneous.mk, src/of-nan.mk, src/of-netcdf.mk, src/of-nurbs.mk, src/of-ocs.mk, src/of-octcdf.mk,
src/of-odepkg.mk, src/of-optim.mk, src/of-quaternion.mk, src/of-queueing.mk, src/of-signal.mk, src/of-sockets.mk,
src/of-sparsersb.mk, src/of-specfun.mk, src/of-splines.mk, src/of-statistics.mk, src/of-stk.mk,
src/of-strings.mk, src/of-struct.mk, src/of-tisean.mk, src/of-tsa.mk, src/of-video.mk, src/of-windows.mk,
src/of-zenity.mk, src/of-zeromq.mk: add $(PKG)_DEPS += $(OCTAVE_TARGET) if ENABLE_BINARY_PACKAGES = yes
author | John D |
---|---|
date | Mon, 14 Aug 2017 09:12:34 -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)