Mercurial > mxe-octave

comparison src/armadillo-1-staticlib.patch @ 2773:603f5be8a550

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package armadillo
author Mark Brand <mabrand@mabrand.nl>
date Thu, 20 Sep 2012 20:43:27 +0200
parents 82d1044a4434
children
comparison
equal deleted inserted replaced
2772:07832042b06a 2773:603f5be8a550
1 This file is part of MXE. 1 This file is part of MXE.
2 See index.html for further information. 2 See index.html for further information.
3 3
4 --- armadillo-3.4.0/CMakeLists.txt.orig 2012-09-06 09:43:16.000000000 +0200 4 diff -urN a/CMakeLists.txt b/CMakeLists.txt
5 +++ armadillo-3.4.0/CMakeLists.txt 2012-09-09 16:18:57.000000000 +0200 5 --- a/CMakeLists.txt 2012-09-14 16:43:20.000000000 +0200
6 +++ b/CMakeLists.txt 2012-09-20 20:39:05.073039124 +0200
6 @@ -40,7 +40,7 @@ 7 @@ -40,7 +40,7 @@
7 set(ARMA_USE_ATLAS false) 8 set(ARMA_USE_ATLAS false)
8 set(ARMA_USE_BOOST false) 9 set(ARMA_USE_BOOST false)
9 set(ARMA_USE_HDF5 false) 10 set(ARMA_USE_HDF5 false)
10 -set(ARMA_USE_WRAPPER true ) 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
11 +set(ARMA_USE_WRAPPER false) 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
12 13
13 14
14 if(WIN32) 15 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 @@ 16 @@ -263,7 +263,7 @@
36 #set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 17 #set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
37 18
38 19
39 -add_library( armadillo SHARED src/wrap_libs ) 20 -add_library( armadillo SHARED src/wrap_libs )