Changeset 8c5fa53 in tol

Timestamp:

May 8, 2015, 3:50:19 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

0cc1a53

Parents:

aecf1e4

Message:

refs #1812, #1818, closes #1846, se actualizan los contribs con una compilacion haciendo uso de la opcion -mno-aling-double.

Ver actualizacion en lasinstrucciones de compilacion en ​https://www.tol-project.org/wiki/CompileMINGW32

Importante los paquetes binarios deben recompilarse todos usando la opcion de configuracion -DCMAKE_TOOLCHAIN_FILE=..\..\..\tol\cmake\mingw-m32.toolchain.cmake

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

Files:

• tol/CMakeLists.txt (modified) (7 diffs)
• tol/bbasic/dir.cpp (modified) (3 diffs)
• tol/cmake/mingw-m32.toolchain.cmake (modified) (1 diff)
• tolbase/CMakeLists.txt (modified) (2 diffs)
• tolbase/generic/CMakeLists.txt (modified) (1 diff)
• toltcl/CMakeLists.txt (modified) (2 diffs)

tol/CMakeLists.txt

@@ -5 +5 @@
   if( CMAKE_BUILD_TYPE MATCHES Debug )
     set( TOL_EXTERNAL_PREFIX "${TOL_EXTERNAL_DEVEL_DIR}/debug" )
-    set( CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb -mno-align-double" )
-    set( CMAKE_C_FLAGS_DEBUG "-O0 -ggdb -mno-align-double" )
   else( CMAKE_BUILD_TYPE MATCHES DEBUG )
     set( TOL_EXTERNAL_PREFIX "${TOL_EXTERNAL_DEVEL_DIR}/release" )
-    set( CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -mno-align-double" )
-    set( CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -mno-align-double" )
   endif( CMAKE_BUILD_TYPE MATCHES Debug )
   set( CMAKE_PREFIX_PATH "${TOL_EXTERNAL_PREFIX}" ${CMAKE_PREFIX_PATH} )
@@ -17 +13 @@
   set( CBLAS_DIR "${TOL_EXTERNAL_PREFIX}" )
   set( CLAPACK_DIR "${TOL_EXTERNAL_PREFIX}" )
-  set( ZIPARCHIVE_AS_STATIC 1 )
+  set( ZIPARCHIVE_AS_STATIC 0 )
   set( CINT_ROOT_DIR "${TOL_EXTERNAL_PREFIX}/include/cint" )
   set( PKG_FFTW_LIBRARY_DIRS "${TOL_EXTERNAL_PREFIX}/lib" CACHE INTERNAL "" )
@@ -48 +44 @@
 
 if ( MINGW )
-  add_definitions( "-Wno-attributes" )
+  #add_definitions( "-Wno-attributes" )
+  add_definitions( "-Wall" )
 endif( MINGW )
 if( WIN32 )
@@ -244 +241 @@
 
 # BOOST configuration
-find_package( Boost REQUIRED COMPONENTS thread system )
+find_package( Boost REQUIRED COMPONENTS thread system filesystem )
 
 if( Boost_FOUND AND TRACE_COMPONENTS_FOUND )
@@ -396 +393 @@
 add_custom_target( COPY_HEADERS ALL DEPENDS ${COPY_HEADERS_DEPENDS} )
 
-if( WIN32 AND TOL_EXTERNAL_DEVEL_DIR )
-  file( TO_CMAKE_PATH "${TOL_EXTERNAL_DEVEL_DIR}/Runtime_Base" rt_base_dir )
-  install( DIRECTORY "${rt_base_dir}/bin" "${rt_base_dir}/lib" "${rt_base_dir}/include"
-    COMPONENT RUNTIME DESTINATION "." ) 
-  install( DIRECTORY "${rt_base_dir}/include"
-    COMPONENT DEVEL DESTINATION "." )
-  file( TO_CMAKE_PATH "${TOL_EXTERNAL_PREFIX}/include" devel_include_dir )
-  install( DIRECTORY "${devel_include_dir}/google"
-    COMPONENT DEVEL DESTINATION "include" )
-  install( DIRECTORY "${devel_include_dir}/sparsehash"
-    COMPONENT DEVEL DESTINATION "include" )
-  install( DIRECTORY "${devel_include_dir}/libltdl"
-    COMPONENT DEVEL DESTINATION "include" )
-  install( FILES "${devel_include_dir}/ltdl.h" COMPONENT DEVEL DESTINATION include )
-  install( DIRECTORY "${devel_include_dir}/gsl"
-    COMPONENT DEVEL DESTINATION "include" )
-  file( TO_CMAKE_PATH "${TOL_EXTERNAL_PREFIX}/lib" devel_lib_dir )
-  install( FILES "${devel_lib_dir}/libltdl.dll.a" COMPONENT DEVEL DESTINATION lib )
-  install( FILES "${devel_lib_dir}/libgsl.dll.a" COMPONENT DEVEL DESTINATION lib )
-  install( FILES "${devel_lib_dir}/libgslcblas.dll.a" COMPONENT DEVEL DESTINATION lib )
-  
-  #message( STATUS "Looking dll's at ${TOL_EXTERNAL_PREFIX}/bin" )
-  file( TO_CMAKE_PATH "${TOL_EXTERNAL_PREFIX}/bin/*.dll" dll_pattern )
-  file( GLOB RT_DLL  ${dll_pattern} )
-  #message( STATUS "Result: ${RT_DLL}" )
-  list( APPEND RT_DLL ${LAPACK_LIBRARIES} )
-  #message( STATUS ${RT_DLL} )
-  install( FILES ${RT_DLL} COMPONENT RUNTIME DESTINATION bin )
-endif( )
-
 install( TARGETS tolcon RUNTIME DESTINATION bin )
 install( TARGETS tol
@@ -431 +398 @@
 install( DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/tol" 
   DESTINATION "include"
+  COMPONENT DEVELOPMENT
   FILES_MATCHING PATTERN "*.h" )
 install( DIRECTORY stdlib COMPONENT RUNTIME DESTINATION "bin" 
@@ -436 +404 @@
   PATTERN "*.bst"
   PATTERN "*.oza" )
+
+if( WIN32 AND TOL_EXTERNAL_DEVEL_DIR )
+  if( NOT EXISTS ${CMAKE_INSTALL_PREFIX}/bin )
+    file( MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin )
+  endif( )
+  if( NOT EXISTS ${CMAKE_INSTALL_PREFIX}/lib )
+    file( MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib )
+  endif( )
+  if( NOT EXISTS ${CMAKE_INSTALL_PREFIX}/include )
+    file( MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/include )
+  endif( )  
+  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 libclapack.dll libcblas.dll libboost_filesystem.dll libboost_system.dll)
+    list( APPEND RT_DLL "${TOL_EXTERNAL_PREFIX}/lib/${dll}" )
+  endforeach( )
+  list( GET RT_DLL 0 rt_dll0)
+  get_filename_component( name_rt_dll0 ${rt_dll0} NAME )
+  if( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/bin/${name_rt_dll0}" )
+    file( INSTALL ${RT_DLL} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" )
+  endif( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/bin/${name_rt_dll0}" )
+  if( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/lib/tkdnd" )
+    file( GLOB tcl-libs "${TOL_EXTERNAL_DEVEL_DIR}/tcl-libs/*" )
+    file( INSTALL ${tcl-libs} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
+  endif( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/lib/tkdnd" )
+  if( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/lib/tcl8.4" )
+    file( INSTALL
+          "${TOL_EXTERNAL_PREFIX}/lib/dde1.3"
+          "${TOL_EXTERNAL_PREFIX}/lib/reg1.2"
+          "${TOL_EXTERNAL_PREFIX}/lib/tcl8.4"
+          "${TOL_EXTERNAL_PREFIX}/lib/TclCurl7.22.0"
+          "${TOL_EXTERNAL_PREFIX}/lib/tk8.4"
+          DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
+  endif( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/lib/tcl8.4" )
+  if( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/include/tcl.h" )
+    file( GLOB tcl_h "${TOL_EXTERNAL_PREFIX}/include/tcl*.h" )
+    file( GLOB tk_h "${TOL_EXTERNAL_PREFIX}/include/tk*.h" )
+    file( INSTALL ${tcl_h} DESTINATION "${CMAKE_INSTALL_PREFIX}/include" )
+    file( INSTALL ${tk_h} DESTINATION "${CMAKE_INSTALL_PREFIX}/include" )
+    file( INSTALL "${TOL_EXTERNAL_PREFIX}/include/X11" DESTINATION "${CMAKE_INSTALL_PREFIX}/include" )
+  endif( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/include/tcl.h" )
+  if( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/include/google" )
+    file( INSTALL
+          "${TOL_EXTERNAL_PREFIX}/include/google" 
+          "${TOL_EXTERNAL_PREFIX}/include/sparsehash"
+          "${TOL_EXTERNAL_PREFIX}/include/libltdl"
+          "${TOL_EXTERNAL_PREFIX}/include/ltdl.h"
+          "${TOL_EXTERNAL_PREFIX}/include/gsl"
+          DESTINATION "${CMAKE_INSTALL_PREFIX}/include" )
+  endif( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/include/google" )
+  message( STATUS "queee ${CMAKE_INSTALL_PREFIX}/lib/libltdl.dll.a")
+  if( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/lib/libltdl.dll.a" )
+    file( INSTALL 
+          "${TOL_EXTERNAL_PREFIX}/lib/libltdl.dll.a" 
+          "${TOL_EXTERNAL_PREFIX}/lib/libgsl.dll.a"
+          "${TOL_EXTERNAL_PREFIX}/lib/libgslcblas.dll.a"
+          DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
+  endif( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/lib/libltdl.dll.a" )
+  file( GLOB tcl_a "${TOL_EXTERNAL_PREFIX}/lib/libtcl*.a" )
+  message( "tcl_a = ${tcl_a}")
+  list( GET tcl_a 0 tcl_a0 )
+  get_filename_component( name_tcl_a0 ${tcl_a0} NAME )
+  if( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/lib/${name_tcl_a0}" )
+    file( GLOB tk_a "${TOL_EXTERNAL_PREFIX}/lib/libtk*.a" )
+    file( INSTALL ${tcl_a} ${tk_a}
+          DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
+  endif( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/lib/${name_tcl_a0}" )  
+
+endif( WIN32 AND TOL_EXTERNAL_DEVEL_DIR )
 
 set(CPACK_PACKAGE_NAME "TOL")

tol/bbasic/dir.cpp

@@ -65 +65 @@
 #endif
 
+#include "boost/filesystem.hpp"
+
 BTraceInit("dir.cpp");
 
@@ -272 +274 @@
 //--------------------------------------------------------------------
 {
+#if defined( WIN32 ) && defined( __GNUC__ )
+  const char *name = fileName.String();
+  if ( boost::filesystem::exists( name ) && boost::filesystem::is_regular_file( name ) )
+    {
+    return boost::filesystem::file_size( name );
+    }
+  return 0;
+#else
   struct stat fileStat;
   BInt   nBytes=0; // fileStat type is off_t that is long and BInt is long
@@ -277 +287 @@
   stat(fileName.String(), &fileStat);
   nBytes=(BInt)fileStat.st_size;
-
+  
   return(nBytes);
+#endif
 }
 

tol/cmake/mingw-m32.toolchain.cmake

@@ -5 +5 @@
 set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb" CACHE STRING "c++ flags in Debug" )
 set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb" CACHE STRING "c flags in Debug" )
-set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2" CACHE STRING "c++ flags in Release" )
-set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2" CACHE STRING "c flags in Release" )
+set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG  -O2" CACHE STRING "c++ flags in Release" )
+set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG -O2" CACHE STRING "c flags in Release" )
 set( LINKER_SHARED_FLAGS "${LINKER_SHARED_FLAGS} -m32" CACHE STRING "linker flags" )

tolbase/CMakeLists.txt

@@ -22 +22 @@
 # look for tcl
 if ( WIN32 AND TOL_PREFIX_PATH )
-  set( TCL_LIBRARY_PATH "${TOL_PREFIX_PATH}/lib" )
-  message( STATUS "buscando dll en = ${TOL_PREFIX_PATH}/bin" )
+  if( CMAKE_BUILD_TYPE STREQUAL "Debug" )
+    set( g "g" )
+  endif( CMAKE_BUILD_TYPE STREQUAL "Debug" )
+  file( TO_CMAKE_PATH "${TOL_PREFIX_PATH}" TCL_LIBRARY_PATH )
+  set( TCL_LIBRARY_PATH "${TCL_LIBRARY_PATH}/lib" )
+  message( STATUS "buscando tcl libs en ${TCL_LIBRARY_PATH} libtcl84" )
   find_library( TCL_LIBRARY
       NAMES "tcl84" "tcl85" "tcl86"
@@ -49 +53 @@
 if( TCL_FOUND )
   message( STATUS ${TCL_INCLUDE_PATH} )
-  message( STATUS ${TCL_LIBRARY_PATH} )
   get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH} PATH )
   message( STATUS "Using CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )

tolbase/generic/CMakeLists.txt

@@ -4 +4 @@
 message( STATUS "Using TCL_INCLUDE_PATH = ${TCL_INCLUDE_PATH}" )
 message( STATUS "Using TCL_LIBRARY = ${TCL_LIBRARY}" )
-message( STATUS "Using TK_LIBRARY = ${TCL_LIBRARY}" )
+message( STATUS "Using TK_LIBRARY = ${TK_LIBRARY}" )
 
 if ( WIN32 )

toltcl/CMakeLists.txt

@@ -22 +22 @@
 # look for tcl
 if ( WIN32 AND TOL_PREFIX_PATH )
-  set( TCL_LIBRARY_PATH "${TOL_PREFIX_PATH}/lib" )
+  if( CMAKE_BUILD_TYPE STREQUAL "Debug" )
+    set( g "g" )
+  endif( CMAKE_BUILD_TYPE STREQUAL "Debug" )
+  file( TO_CMAKE_PATH "${TOL_PREFIX_PATH}" TCL_LIBRARY_PATH )
+  set( TCL_LIBRARY_PATH "${TCL_LIBRARY_PATH}/lib" )
+  message( STATUS "buscando tcl libs en ${TCL_LIBRARY_PATH} libtclstub84" )
   find_library( TCL_STUB_LIBRARY
       NAMES "libtclstub84" "libtclstub85" "libtclstub86"
@@ -28 +33 @@
       NO_DEFAULT_PATH
     )
-  message( STATUS "buscando dll en = ${TOL_PREFIX_PATH}/bin" )
   find_library( TCL_LIBRARY
-      NAMES "tcl84" "tcl85" "tcl86"
+      NAMES "libtcl84" "libtcl85" "libtcl86"
       PATHS "${TCL_LIBRARY_PATH}"
       NO_DEFAULT_PATH