Changeset 3cc480d in tol

Timestamp:

Nov 12, 2015, 10:50:39 AM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

297e754

Parents:

43da12e

Message:

fixes #1894, en la inicialización de tolsh se incluye en la variable auto_path el path del directorio lib de tol que es donde se debe instalar toltcl. En CMakeLists.txt se fuerza a que CMAKE_INSTALL_PREFIX sea el de TOL. La variable INSTALL_WITH_TOL, por omisión a 1, permite controlar si queremos instalarlo en el prefix de tcl del sistema.

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

Location:

toltcl

Files:

• CMakeLists.txt (modified) (2 diffs)
• generic/tolsh.c (modified) (1 diff)

toltcl/CMakeLists.txt

@@ -1 +1 @@
 cmake_minimum_required( VERSION 2.8 )
 project( TOLTCL )
+
+set( INSTALL_WITH_TOL 1 )
 
 set( CMAKE_MODULE_PATH
@@ -55 +57 @@
   message( STATUS ${TCL_INCLUDE_PATH} )
   message( STATUS ${TCL_LIBRARY_PATH} )
-  get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH} PATH )
+  if( ${INSTALL_WITH_TOL} )
+    set( CMAKE_INSTALL_PREFIX ${TOL_PREFIX_PATH} )
+  else( ${INSTALL_WITH_TOL} )
+    get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH} PATH )
+  endif( )
   message( STATUS "Using CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )
 else( TCL_FOUND )

toltcl/generic/tolsh.c

@@ -30 +30 @@
     }
   SetupArgv( interp );
-  Tcl_PkgRequire( interp, "TolshApp", TOLTCL_VERSION, 1);
+  Tcl_VarEval( interp, "lappend", " auto_path", " [file join",
+               " [file dir [file dir ", Tcl_GetNameOfExecutable(),
+               " ] ] lib ]", NULL );
+  if ( !Tcl_PkgRequire( interp, "TolshApp", TOLTCL_VERSION, 1) )
+    {
+    printf( "%s\n", Tcl_GetStringResult( interp ) );
+    Tcl_Exit( -1 );
+    }
   return TCL_OK;
 }