blob: a643985148b21ecb40a7a5faf4adabd63030993f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
This file is part of MXE.
See index.html for further information.
diff -urN a/CMakeLists.txt b/CMakeLists.txt
--- 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)
set(ARMA_USE_HDF5 false)
-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,
@@ -340,7 +340,7 @@
message(STATUS "CMAKE_SHARED_LINKER_FLAGS = ${CMAKE_SHARED_LINKER_FLAGS}")
-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})
|
