Changeset 8c5fa53 in tol for tolbase/CMakeLists.txt

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

File:

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

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}" )