Mercurial > mxe-octave

annotate src/armadillo-1-staticlib.patch @ 3256:7fb479d0241c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update build tools for native mingw * src/build-m4.mk: do nothing for native mingw build * Makefile.in: - add bison, m4 as natve mingw, and python as jit build requirements. - remove build-bison as a mingw build dependancy * index.html: Add msys-bison to mingw required packages and mention ghostscript and python.
author John Donoghue <john.donoghue@ieee.org>
date Thu, 26 Sep 2013 21:18:39 -0400
parents 603f5be8a550
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2720
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
1 This file is part of MXE.
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
2 See index.html for further information.
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
3
2773
603f5be8a550 update package armadillo
Mark Brand <mabrand@mabrand.nl>
parents: 2720
diff changeset
4 diff -urN a/CMakeLists.txt b/CMakeLists.txt
603f5be8a550 update package armadillo
Mark Brand <mabrand@mabrand.nl>
parents: 2720
diff changeset
5 --- a/CMakeLists.txt 2012-09-14 16:43:20.000000000 +0200
603f5be8a550 update package armadillo
Mark Brand <mabrand@mabrand.nl>
parents: 2720
diff changeset
6 +++ b/CMakeLists.txt 2012-09-20 20:39:05.073039124 +0200
2720
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
7 @@ -40,7 +40,7 @@
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
8 set(ARMA_USE_ATLAS false)
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
9 set(ARMA_USE_BOOST false)
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
10 set(ARMA_USE_HDF5 false)
2773
603f5be8a550 update package armadillo
Mark Brand <mabrand@mabrand.nl>
parents: 2720
diff changeset
11 -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
603f5be8a550 update package armadillo
Mark Brand <mabrand@mabrand.nl>
parents: 2720
diff changeset
12 +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
2720
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
13
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
14
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
15 if(WIN32)
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
16 @@ -263,7 +263,7 @@
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
17 #set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
18
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
19
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
20 -add_library( armadillo SHARED src/wrap_libs )
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
21 +add_library( armadillo STATIC src/wrap_libs )
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
22 target_link_libraries( armadillo ${ARMA_LIBS} )
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
23
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
24 set_target_properties(armadillo PROPERTIES VERSION ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH} SOVERSION 3)