Mercurial > mxe-octave
annotate src/armadillo-1-staticlib.patch @ 3580:51563235a7c6
curl: update to 7.36.0
* src/curl.mk: update to 7.36.0
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Wed, 23 Apr 2014 20:12:41 -0400 |
parents | 603f5be8a550 |
children |
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 | 4 diff -urN a/CMakeLists.txt b/CMakeLists.txt |
5 --- a/CMakeLists.txt 2012-09-14 16:43:20.000000000 +0200 | |
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 | 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 |
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) |