diff options
Diffstat (limited to 'src/armadillo-1-staticlib.patch')
| -rw-r--r-- | src/armadillo-1-staticlib.patch | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/armadillo-1-staticlib.patch b/src/armadillo-1-staticlib.patch index 19f8b4d..a643985 100644 --- a/src/armadillo-1-staticlib.patch +++ b/src/armadillo-1-staticlib.patch @@ -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, -@@ -289,7 +289,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}) - |