Mercurial > mxe-octave

comparison 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
comparison
equal deleted inserted replaced
2718:c38f62ba10b1 2720:82d1044a4434
1 This file is part of MXE.
2 See index.html for further information.
3
4 --- armadillo-3.4.0/CMakeLists.txt.orig 2012-09-06 09:43:16.000000000 +0200
5 +++ armadillo-3.4.0/CMakeLists.txt 2012-09-09 16:18:57.000000000 +0200
6 @@ -40,7 +40,7 @@
7 set(ARMA_USE_ATLAS false)
8 set(ARMA_USE_BOOST false)
9 set(ARMA_USE_HDF5 false)
10 -set(ARMA_USE_WRAPPER true )
11 +set(ARMA_USE_WRAPPER false)
12
13
14 if(WIN32)
15 @@ -158,15 +158,15 @@
16 endif()
17
18 else()
19 +
20 + if(ARMA_USE_LAPACK STREQUAL true)
21 + set(ARMA_LIBS ${ARMA_LIBS} ${LAPACK_LIBRARIES})
22 + endif()
23
24 if(ARMA_USE_BLAS STREQUAL true)
25 set(ARMA_LIBS ${ARMA_LIBS} ${BLAS_LIBRARIES})
26 endif()
27
28 - if(ARMA_USE_LAPACK STREQUAL true)
29 - set(ARMA_LIBS ${ARMA_LIBS} ${LAPACK_LIBRARIES})
30 - endif()
31 -
32 if(ARMA_USE_ATLAS STREQUAL true)
33 set(ARMA_LIBS ${ARMA_LIBS} ${CBLAS_LIBRARIES})
34 set(ARMA_LIBS ${ARMA_LIBS} ${CLAPACK_LIBRARIES})
35 @@ -263,7 +263,7 @@
36 #set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
37
38
39 -add_library( armadillo SHARED src/wrap_libs )
40 +add_library( armadillo STATIC src/wrap_libs )
41 target_link_libraries( armadillo ${ARMA_LIBS} )
42
43 set_target_properties(armadillo PROPERTIES VERSION ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH} SOVERSION 3)