update package armadillo

This commit is contained in:
Niels Kristian Bech Jensen 2013-12-26 13:33:49 +11:00 committed by Tony Theodore
parent d551c7e9a1
commit c0249d6763
2 changed files with 11 additions and 12 deletions

View File

@ -2,8 +2,8 @@ This file is part of MXE.
See index.html for further information.
diff -urN a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2013-04-26 08:48:11.000000000 +0200
+++ b/CMakeLists.txt 2013-04-27 18:49:46.454530270 +0200
--- a/CMakeLists.txt 2013-12-06 08:39:40.000000000 +0100
+++ b/CMakeLists.txt 2013-12-06 14:05:54.098314032 +0100
@@ -32,7 +32,7 @@
set(ARMA_USE_ATLAS false)
set(ARMA_USE_BOOST false)
@ -11,14 +11,13 @@ diff -urN a/CMakeLists.txt b/CMakeLists.txt
-set(ARMA_USE_WRAPPER true )
+set(ARMA_USE_WRAPPER false)
# NOTE:
# Set ARMA_USE_WRAPPER to false if you're getting linking errors when compiling your programs,
@@ -320,7 +320,7 @@
message(STATUS "CMAKE_SHARED_LINKER_FLAGS = ${CMAKE_SHARED_LINKER_FLAGS}")
endif()
## NOTE:
## Set ARMA_USE_WRAPPER to false if you're getting linking errors when compiling your programs,
@@ -340,7 +340,7 @@
message(STATUS "CMAKE_SHARED_LINKER_FLAGS = ${CMAKE_SHARED_LINKER_FLAGS}")
-add_library( armadillo SHARED src/wrap_libs )
+add_library( armadillo STATIC src/wrap_libs )
-add_library( armadillo SHARED src/wrapper )
+add_library( armadillo STATIC src/wrapper )
target_link_libraries( armadillo ${ARMA_LIBS} )
set_target_properties(armadillo PROPERTIES VERSION ${ARMA_MAJOR}.${ARMA_MINOR_ALT}.${ARMA_PATCH} SOVERSION ${ARMA_MAJOR})

View File

@ -3,8 +3,8 @@
PKG := armadillo
$(PKG)_IGNORE :=
$(PKG)_VERSION := 3.920.4
$(PKG)_CHECKSUM := bfa0e96c207dc69fedb405602a28c718c4e9e16e
$(PKG)_VERSION := 3.930.0
$(PKG)_CHECKSUM := 3952fde76b9479ee22d1b4549eaa5939ced8d946
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/arma/$($(PKG)_FILE)