Changeset 80618c5 in tol

Timestamp:

May 29, 2015, 8:12:36 AM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

11cb1c4b

Parents:

eff5225

Message:

refs #1812, #1818, eliminamos dependencia de Rblas y Rlapack, hay que usar el nuevo contrib desde ​http://packages.tol-project.org/win32/development/toldevel-rtools-m32.exe

Luego hay que limpiar el cache de cmake para refrescar las nuevas libs de blas/lapack, para ello debemos ejecutar desde el directorio de compilacion la siguiente instruccion:

cmake -U BLAS -U LAPACK .

Reccompilar con:

mingw32-make

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@6744 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/CMakeLists.txt (modified) (2 diffs)

tol/CMakeLists.txt

@@ -250 +250 @@
 include_directories( ${Boost_INCLUDE_DIRS} )
 
-find_package( R REQUIRED )
-if( R_COMMAND AND TRACE_COMPONENTS_FOUND )
-  message( STATUS "R FOUND at ${R_COMMAND}" )
-  message( STATUS "R_LIBRARY_BLAS = ${R_LIBRARY_BLAS}" )
-  message( STATUS "R_LIBRARY_LAPACK = ${R_LIBRARY_LAPACK}" )
-endif( )
+find_package( BLAS REQUIRED )
+if ( BLAS_FOUND AND TRACE_COMPONENTS_FOUND )
+  message( STATUS "BLAS_LIBRARIES = ${BLAS_LIBRARIES}")
+endif()
 
 # BLAS & LAPACK configuration
-find_package( LAPACK QUIET )
-if( LAPACK_FOUND )
-message( "LAPACK FOUND ")
-else()
-message( "LAPACK NOT FOUND ")
+find_package( LAPACK REQUIRED )
+if( LAPACK_FOUND AND TRACE_COMPONENTS_FOUND )
+  message( STATUS "LAPACK_LIBRARIES = ${LAPACK_LIBRARIES}")
 endif()
-
-if( NOT LAPACK_FOUND )
-  if( R_LIBRARY_LAPACK AND R_LIBRARY_BLAS )
-    set( BLAS_LIBRARIES ${R_LIBRARY_BLAS} CACHE PATH "" )
-    set( LAPACK_LIBRARIES "${R_LIBRARY_BLAS};${R_LIBRARY_LAPACK}" CACHE LIST "")
-        set( LAPACK_FOUND 1 CACHE INTERNAL "" )
-  else()
-    messsage( FATAL_ERROR "Could not find LAPACK library on your system or from R" )
-  endif( )
-endif( )
-
-  if( LAPACK_FOUND AND TRACE_COMPONENTS_FOUND )
-    message( "LAPACK_LIBRARIES = ${LAPACK_LIBRARIES}" )
-endif( )
 
 # ODBC configuration
@@ -384 +366 @@
   ${GSL_LIBRARY} ${CBLAS_LIBRARIES} ${CLAPACK_LIBRARIES}
   ${BZIP2_LIBRARIES} ${Boost_LIBRARIES}
-  ${LAPACK_LIBRARIES} ${FFTW_LIBRARIES} ${ZLIB_LIBRARIES}
-  ${ZIPARCHIVE_LIBRARY} ${CHOLMOD_LIBRARIES} ${LTDL_LIBRARIES} ${PLATFORM_LIBRARIES} )
+  ${FFTW_LIBRARIES} ${ZLIB_LIBRARIES}
+  ${ZIPARCHIVE_LIBRARY} ${CHOLMOD_LIBRARIES} ${LTDL_LIBRARIES}
+  ${PLATFORM_LIBRARIES} ${LAPACK_LIBRARIES} )
 
 add_executable( tolcon tol.cpp )