2019-06-18 01:52:52 +08:00
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -283,25 +283,8 @@
|
|
|
|
|
# and find LAPACK and BLAS ourselves, using a slightly modified variant of the
|
|
|
|
|
# script Armadillo uses to find these.
|
|
|
|
|
if (WIN32)
|
|
|
|
|
- find_library(LAPACK_LIBRARY
|
|
|
|
|
- NAMES lapack liblapack lapack_win32_MT lapack_win32
|
|
|
|
|
- PATHS "C:/Program Files/Armadillo"
|
|
|
|
|
- PATH_SUFFIXES "examples/lib_win32/")
|
|
|
|
|
-
|
|
|
|
|
- if (NOT LAPACK_LIBRARY)
|
|
|
|
|
- message(FATAL_ERROR "Cannot find LAPACK library (.lib)!")
|
|
|
|
|
- endif ()
|
|
|
|
|
-
|
|
|
|
|
- find_library(BLAS_LIBRARY
|
|
|
|
|
- NAMES blas libblas blas_win32_MT blas_win32
|
|
|
|
|
- PATHS "C:/Program Files/Armadillo"
|
|
|
|
|
- PATH_SUFFIXES "examples/lib_win32/")
|
|
|
|
|
-
|
|
|
|
|
- if (NOT BLAS_LIBRARY)
|
|
|
|
|
- message(FATAL_ERROR "Cannot find BLAS library (.lib)!")
|
|
|
|
|
- endif ()
|
|
|
|
|
-
|
|
|
|
|
- # Piggyback LAPACK and BLAS linking into Armadillo link.
|
|
|
|
|
+ find_package(LAPACK)
|
|
|
|
|
+ find_package(BLAS)
|
|
|
|
|
set(ARMADILLO_LIBRARIES
|
|
|
|
|
${ARMADILLO_LIBRARIES} ${BLAS_LIBRARY} ${LAPACK_LIBRARY})
|
|
|
|
|
endif ()
|
|
|
|
|
@@ -395,19 +378,11 @@
|
|
|
|
|
REQUIRED
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
-link_directories(${Boost_LIBRARY_DIRS})
|
|
|
|
|
-
|
|
|
|
|
-# In Visual Studio, automatic linking is performed, so we don't need to worry
|
|
|
|
|
-# about it. Clear the list of libraries to link against and let Visual Studio
|
|
|
|
|
-# handle it.
|
|
|
|
|
-if (MSVC)
|
|
|
|
|
- link_directories(${Boost_LIBRARY_DIRS})
|
|
|
|
|
- set(Boost_LIBRARIES "")
|
|
|
|
|
-endif ()
|
|
|
|
|
+link_directories(${Boost_LIBRARIES})
|
|
|
|
|
|
|
|
|
|
set(MLPACK_INCLUDE_DIRS ${MLPACK_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
|
|
|
|
|
set(MLPACK_LIBRARIES ${MLPACK_LIBRARIES} ${Boost_LIBRARIES})
|
|
|
|
|
-set(MLPACK_LIBRARY_DIRS ${MLPACK_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
|
|
|
|
|
+set(MLPACK_LIBRARY_DIRS ${MLPACK_LIBRARY_DIRS} ${Boost_LIBRARIES})
|
|
|
|
|
|
|
|
|
|
# For Boost testing framework (will have no effect on non-testing executables).
|
|
|
|
|
# This specifies to Boost that we are dynamically linking to the Boost test
|
