Changeset db5c687 in tol

Timestamp:

Oct 14, 2015, 7:58:58 AM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

44cc5fc

Parents:

ed3716e

Message:

refs #1866, se crea la variable WRITE_CONFIG_H para controlar si tol/config.h se crea o no, esto ayuda a evitar recompilaciones innecesarias, por omisión se crea el archivo. Instalamos las libs de desarrollo para blas/lapack/lapacke.

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

File:

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

tol/CMakeLists.txt

@@ -369 +369 @@
 create_header_links( )
 
-set( write_config_h 1 )
-if( write_config_h )
+if( NOT DEFINED WRITE_CONFIG_H )
+  set( WRITE_CONFIG_H 1 )
+endif( NOT DEFINED WRITE_CONFIG_H )
+  
+if( ${WRITE_CONFIG_H} )
   message( STATUS "Invoking CONFIGURE_FILE" )
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in 
@@ -487 +490 @@
           "${TOL_EXTERNAL_PREFIX}/lib/libgsl.dll.a"
           "${TOL_EXTERNAL_PREFIX}/lib/libgslcblas.dll.a"
+                  "${TOL_EXTERNAL_PREFIX}/lib/libblas.lib"
+                  "${TOL_EXTERNAL_PREFIX}/lib/liblapack.lib"
+                  "${TOL_EXTERNAL_PREFIX}/lib/liblapacke.lib"
           DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
   endif( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/lib/libltdl.dll.a" )