Changeset 2328789 in tol for toltcl

Timestamp:

Dec 30, 2015, 1:09:51 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

1f41f130

Parents:

874ea81

Message:

refs #1904, #1905, necesitamos referenciar un simbolo de libtol.so para forzar la dependencia en ubuntu

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

Location:

toltcl

Files:

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

toltcl/CMakeLists.txt

@@ -59 +59 @@
   message( STATUS "TCL_STUB_VERSION = ${TCL_STUB_VERSION}" )
   list( GET TCL_STUB_VERSION 0 TCL_MAJOR_VERSION )
-  list( GET TCL_STUB_VERSION 1 TCL_MINOR_VERSION )
+  #list( GET TCL_STUB_VERSION 1 TCL_MINOR_VERSION )
   message( STATUS "TCL_STUB_VERSION = ${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}" )
   message( STATUS ${TCL_STUB_LIBRARY} )

toltcl/generic/tolsh.c

@@ -1 +1 @@
 #include <tcl.h>
 #include "toltcl.h"
+
+#if !defined(WIN32)
+#include "tol/tol_init.h"
+#endif
 
 static int g_argc = 0;
@@ -45 +49 @@
   g_argc = argc;
   g_argv = argv;
+  const char * version = TOLVersion();
   Tcl_Main( 1, argv, AppInit );
   return 0;