diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b34c36d90d..855a4d8777f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -837,6 +837,15 @@ elseif(WIN32) set(GETTEXT_LIBPATH ${GETTEXT}/lib) set(GETTEXT_LIBRARIES gnu_gettext) endif() + + set(LAPACK ${LIBDIR}/lapack) + # set(LAPACK_INCLUDE_DIR ${LAPACK}/include) + set_lib_path(LAPACK_LIBPATH ${LAPACK}/lib) + set(LAPACK_LIBRARIES + ${LIBDIR}/lapack/lib/libf2c.lib + ${LIBDIR}/lapack/lib/clapack_nowrap.lib + ${LIBDIR}/lapack/lib/BLAS_nowrap.lib + ) set(PNG_LIBRARIES libpng) set(JPEG_LIBRARIES libjpeg) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index eeefcf730c8..fbd28cc2398 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -214,7 +214,8 @@ macro(setup_liblinks ${OPENGL_glu_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} - ${FREETYPE_LIBRARY}) + ${FREETYPE_LIBRARY} + ${LAPACK_LIBRARIES}) # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs