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

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
line wrap: on
line source

This file is part of MXE.
See index.html for further information.

--- armadillo-3.4.0/CMakeLists.txt.orig	2012-09-06 09:43:16.000000000 +0200
+++ armadillo-3.4.0/CMakeLists.txt	2012-09-09 16:18:57.000000000 +0200
@@ -40,7 +40,7 @@
 set(ARMA_USE_ATLAS   false)
 set(ARMA_USE_BOOST   false)
 set(ARMA_USE_HDF5    false)
-set(ARMA_USE_WRAPPER true )
+set(ARMA_USE_WRAPPER false)
 
 
 if(WIN32)
@@ -158,15 +158,15 @@
   endif()
   
 else()
+
+  if(ARMA_USE_LAPACK STREQUAL true)
+    set(ARMA_LIBS ${ARMA_LIBS} ${LAPACK_LIBRARIES})
+  endif()
   
   if(ARMA_USE_BLAS STREQUAL true)
     set(ARMA_LIBS ${ARMA_LIBS} ${BLAS_LIBRARIES})
   endif()
   
-  if(ARMA_USE_LAPACK STREQUAL true)
-    set(ARMA_LIBS ${ARMA_LIBS} ${LAPACK_LIBRARIES})
-  endif()
-  
   if(ARMA_USE_ATLAS STREQUAL true)
     set(ARMA_LIBS ${ARMA_LIBS} ${CBLAS_LIBRARIES})
     set(ARMA_LIBS ${ARMA_LIBS} ${CLAPACK_LIBRARIES})
@@ -263,7 +263,7 @@
 #set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
 
 
-add_library( armadillo SHARED src/wrap_libs )
+add_library( armadillo STATIC src/wrap_libs )
 target_link_libraries( armadillo ${ARMA_LIBS} )
 
 set_target_properties(armadillo PROPERTIES VERSION ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH} SOVERSION 3)