Fix El Topo:
authorDaniel Genrich <daniel.genrich@gmx.net>
Tue, 15 May 2012 11:35:01 +0000 (11:35 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Tue, 15 May 2012 11:35:01 +0000 (11:35 +0000)
- 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?

CMakeLists.txt
build_files/cmake/macros.cmake

index 6b34c36d90db571ffd8c926670f201c2d976455c..855a4d8777f06a738b07605f58b8bb33dc57cb66 100644 (file)
@@ -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)
index eeefcf730c85812e66cbe2d58ebbe867a732f834..fbd28cc239891cd97f910cc58e9789eb1974454f 100644 (file)
@@ -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