Changeset ed3716e in tol for toltcl

Timestamp:

Oct 11, 2015, 9:56:21 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

db5c687

Parents:

a716459

Message:

refs #1866, TOL_PREFIX_PATH puede ser un path relativo, CMAKE_INSTALL_PREFIX en windows viene con un valor por omisión hay que sobreescribirlo, se corrigen errores de conversión entre int y void*

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

Location:

toltcl

Files:

• CMakeLists.txt (modified) (2 diffs)
• cmake/modules/FindTOL.cmake (modified) (3 diffs)
• generic/tolaccess.cpp (modified) (2 diffs)

toltcl/CMakeLists.txt

@@ -27 +27 @@
   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" )
+  message( STATUS "buscando tcl libs en ${TCL_LIBRARY_PATH}" )
   find_library( TCL_STUB_LIBRARY
       NAMES "libtclstub84" "libtclstub85" "libtclstub86"
@@ -55 +55 @@
   message( STATUS ${TCL_INCLUDE_PATH} )
   message( STATUS ${TCL_LIBRARY_PATH} )
-  if ( NOT CMAKE_INSTALL_PREFIX )
-    get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH} PATH )
-  endif( )
+  get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH} PATH )
   message( STATUS "Using CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )
 else( TCL_FOUND )

toltcl/cmake/modules/FindTOL.cmake

@@ -14 +14 @@
 set( TOL_FOUND 0 )
 
-if( EXISTS ${TOL_PREFIX_PATH} )
-
+if( DEFINED TOL_PREFIX_PATH )
+  if( NOT IS_ABSOLUTE ${TOL_PREFIX_PATH} )
+    file( TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${TOL_PREFIX_PATH}" TOL_PREFIX_PATH )
+    get_filename_component( TOL_PREFIX_PATH ${TOL_PREFIX_PATH} ABSOLUTE )
+  endif()
   #find includes
   find_path(
@@ -28 +31 @@
     PATH_SUFFIXES "lib"
     NO_DEFAULT_PATH )
-else(  EXISTS ${TOL_PREFIX_PATH} )
+else( DEFINED TOL_PREFIX_PATH )
 
   #find includes
@@ -36 +39 @@
   find_library( TOL_LIBRARY
     NAMES tol )
-endif( EXISTS ${TOL_PREFIX_PATH} )
+endif( DEFINED TOL_PREFIX_PATH )
 
 set( TOL_PROCESS_INCLUDES TOL_INCLUDE_DIR )

toltcl/generic/tolaccess.cpp

@@ -695 +695 @@
                                       syn, indexes))) {
       /* found!!! */
-      indexes.AppendObject((void*)j);      
+          intptr_t jCast = j;
+      indexes.AppendObject((void*)jCast);      
       return 1;
     }
@@ -804 +805 @@
     int last = indexes.GetLast();
     for(j = last; j >= 0; j--)
-      items[last+2-j] = Tcl_NewIntObj(long(*indexes._GetObject(j)));
+      items[last+2-j] = Tcl_NewIntObj(intptr_t(*indexes._GetObject(j)));
     Tcl_SetListObj(obj_result, indexes.GetSize()+2, items);
     Tcl_Free((char*)items);