Mercurial > mxe-octave

annotate src/armadillo-1-staticlib.patch @ 2720:82d1044a4434

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added armadillo 3.4.0 with test
author Christian Frisson <christian.frisson@gmail.com>
date Sun, 09 Sep 2012 17:01:46 +0200
parents
children 603f5be8a550
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
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
4 --- armadillo-3.4.0/CMakeLists.txt.orig 2012-09-06 09:43:16.000000000 +0200
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
5 +++ armadillo-3.4.0/CMakeLists.txt 2012-09-09 16:18:57.000000000 +0200
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
6 @@ -40,7 +40,7 @@
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
7 set(ARMA_USE_ATLAS false)
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
8 set(ARMA_USE_BOOST false)
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
9 set(ARMA_USE_HDF5 false)
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
10 -set(ARMA_USE_WRAPPER true )
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
11 +set(ARMA_USE_WRAPPER false)
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
12
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 if(WIN32)
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
15 @@ -158,15 +158,15 @@
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
16 endif()
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
17
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
18 else()
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 + if(ARMA_USE_LAPACK STREQUAL true)
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
21 + set(ARMA_LIBS ${ARMA_LIBS} ${LAPACK_LIBRARIES})
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
22 + endif()
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 if(ARMA_USE_BLAS STREQUAL true)
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
25 set(ARMA_LIBS ${ARMA_LIBS} ${BLAS_LIBRARIES})
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
26 endif()
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
27
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
28 - if(ARMA_USE_LAPACK STREQUAL true)
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
29 - set(ARMA_LIBS ${ARMA_LIBS} ${LAPACK_LIBRARIES})
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
30 - endif()
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
31 -
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
32 if(ARMA_USE_ATLAS STREQUAL true)
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
33 set(ARMA_LIBS ${ARMA_LIBS} ${CBLAS_LIBRARIES})
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
34 set(ARMA_LIBS ${ARMA_LIBS} ${CLAPACK_LIBRARIES})
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
35 @@ -263,7 +263,7 @@
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
36 #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
37
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
38
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
39 -add_library( armadillo SHARED src/wrap_libs )
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
40 +add_library( armadillo STATIC src/wrap_libs )
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
41 target_link_libraries( armadillo ${ARMA_LIBS} )
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
42
82d1044a4434 added armadillo 3.4.0 with test
Christian Frisson <christian.frisson@gmail.com>
parents:
diff changeset
43 set_target_properties(armadillo PROPERTIES VERSION ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH} SOVERSION 3)