| diff -Naur a/CMakeLists.txt b/CMakeLists.txt |
| --- a/CMakeLists.txt 2015-01-07 22:53:12.000000000 +0600 |
| +++ b/CMakeLists.txt 2015-05-17 14:07:51.473444100 +0600 |
| @@ -263,7 +263,7 @@ |
| # because then we are required to have a FORTRAN compiler (argh!) so we will try |
| # and find LAPACK and BLAS ourselves, using a slightly modified variant of the |
| # script Armadillo uses to find these. |
| -if (WIN32) |
| +if (MSVC) |
| find_library(LAPACK_LIBRARY |
| NAMES lapack liblapack lapack_win32_MT lapack_win32 |
| PATHS "C:/Program Files/Armadillo" |
| @@ -370,7 +370,7 @@ |
| include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src/) |
| |
| # On Windows, things end up under Debug/ or Release/. |
| -if (WIN32) |
| +if (MSVC) |
| set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) |
| set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) |
| set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) |
