Changeset 2d7c45e in tol

Timestamp:

Oct 23, 2015, 7:05:51 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

e0e4105

Parents:

4565f6b

Message:

refs #1866, ponemos una traza de SIZEOF_VOID_P ya que en alguna circunstancia está vacío

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

Location:

tol

Files:

• CMakeLists.txt (modified) (2 diffs)
• btol/set_type/CMakeLists.txt (modified) (1 diff)

tol/CMakeLists.txt

@@ -441 +441 @@
   file( TO_CMAKE_PATH "${TOL_EXTERNAL_PREFIX}/bin/*.dll" dll_pattern )
   file( GLOB RT_DLL  ${dll_pattern} )
-  list( APPEND RT_DLL ${LAPACK_LIBRARIES} )
   foreach( dll libboost_filesystem.dll libboost_system.dll)
     list( APPEND RT_DLL "${TOL_EXTERNAL_PREFIX}/lib/${dll}" )
@@ -490 +489 @@
           "${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"
+                  "${TOL_EXTERNAL_PREFIX}/lib/libblas.dll.a"
+                  "${TOL_EXTERNAL_PREFIX}/lib/liblapack.dll.a"
+                  "${TOL_EXTERNAL_PREFIX}/lib/liblapacke.dll.a"
           DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
   endif( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/lib/libltdl.dll.a" )

tol/btol/set_type/CMakeLists.txt

@@ -1 +1 @@
 create_header_links( )
+
+message( STATUS "CMAKE_SIZEOF_VOID_P = ${CMAKE_SIZEOF_VOID_P}")
 
 add_definitions(