Fix El Topo:

- Library compile errors
- 2 Bugs (have been reported to lib owner)
- LAPACK for cmake

TODO:
- Scons is still missing LAPACK lib define
- Do other platforms got LAPACK lib?
This commit is contained in:
Daniel Genrich
2012-05-15 11:35:01 +00:00
parent 763a16cb70
commit 7f92b5f79a
2 changed files with 11 additions and 1 deletions

View File

@@ -837,6 +837,15 @@ elseif(WIN32)
set(GETTEXT_LIBPATH ${GETTEXT}/lib) set(GETTEXT_LIBPATH ${GETTEXT}/lib)
set(GETTEXT_LIBRARIES gnu_gettext) set(GETTEXT_LIBRARIES gnu_gettext)
endif() 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(PNG_LIBRARIES libpng)
set(JPEG_LIBRARIES libjpeg) set(JPEG_LIBRARIES libjpeg)

View File

@@ -214,7 +214,8 @@ macro(setup_liblinks
${OPENGL_glu_LIBRARY} ${OPENGL_glu_LIBRARY}
${PNG_LIBRARIES} ${PNG_LIBRARIES}
${ZLIB_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 # 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 if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs