2012-09-09 16:01:46 +01:00
|
|
|
This file is part of MXE.
|
|
|
|
|
See index.html for further information.
|
|
|
|
|
|
2012-09-20 19:43:27 +01:00
|
|
|
diff -urN a/CMakeLists.txt b/CMakeLists.txt
|
2013-12-26 02:33:49 +00:00
|
|
|
--- a/CMakeLists.txt 2013-12-06 08:39:40.000000000 +0100
|
|
|
|
|
+++ b/CMakeLists.txt 2013-12-06 14:05:54.098314032 +0100
|
2013-04-28 06:21:47 +01:00
|
|
|
@@ -32,7 +32,7 @@
|
2012-09-09 16:01:46 +01:00
|
|
|
set(ARMA_USE_ATLAS false)
|
|
|
|
|
set(ARMA_USE_BOOST false)
|
|
|
|
|
set(ARMA_USE_HDF5 false)
|
2013-04-28 06:21:47 +01:00
|
|
|
-set(ARMA_USE_WRAPPER true )
|
|
|
|
|
+set(ARMA_USE_WRAPPER false)
|
2012-09-09 16:01:46 +01:00
|
|
|
|
2013-12-26 02:33:49 +00:00
|
|
|
## 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}")
|
2012-09-09 16:01:46 +01:00
|
|
|
|
2013-12-26 02:33:49 +00:00
|
|
|
|
|
|
|
|
-add_library( armadillo SHARED src/wrapper )
|
|
|
|
|
+add_library( armadillo STATIC src/wrapper )
|
2012-09-09 16:01:46 +01:00
|
|
|
target_link_libraries( armadillo ${ARMA_LIBS} )
|
2013-03-25 09:21:50 +00:00
|
|
|
set_target_properties(armadillo PROPERTIES VERSION ${ARMA_MAJOR}.${ARMA_MINOR_ALT}.${ARMA_PATCH} SOVERSION ${ARMA_MAJOR})
|
