Changeset 874ea81 in tol

Timestamp:

Dec 30, 2015, 10:38:16 AM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

2328789

Parents:

b3f4e24

Message:

refs #1904, #1905, en linux enlazamos libtol.so al proceso principal para resolver, toltcl encontrará sus simbolos en memoria cuando se cargue

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

Location:

toltcl

Files:

• CMakeLists.txt (modified) (1 diff)
• generic/CMakeLists.txt (modified) (1 diff)

toltcl/CMakeLists.txt

@@ -54 +54 @@
 
 if( TCL_FOUND )
+  string(REGEX REPLACE
+    "^.*tclstub([0-9])\\.([0-9]).*$" "\\1;\\2" 
+    TCL_STUB_VERSION "${TCL_STUB_LIBRARY}")  
+  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 )
+  message( STATUS "TCL_STUB_VERSION = ${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}" )
   message( STATUS ${TCL_STUB_LIBRARY} )
   message( STATUS ${TCL_INCLUDE_PATH} )

toltcl/generic/CMakeLists.txt

@@ -16 +16 @@
 set_target_properties( toltcl PROPERTIES COMPILE_FLAGS "-DBUILD_TOLTCL -DUSE_TCL_STUBS")
 
-target_link_libraries( toltcl
-  ${TCL_STUB_LIBRARY} ${TOL_LIBRARY} )
+if( WIN32 )
+  target_link_libraries( toltcl
+    ${TCL_STUB_LIBRARY} ${TOL_LIBRARY} )
+else( WIN32 )
+  target_link_libraries( toltcl
+    ${TCL_STUB_LIBRARY} )
+endif( WIN32 )
 
 add_executable( tolsh tolsh.c )
-target_link_libraries( tolsh ${TCL_LIBRARY} )
+if( WIN32 )
+  target_link_libraries( tolsh ${TCL_LIBRARY} )
+else( WIN32 )
+  target_link_libraries( tolsh ${TCL_LIBRARY} ${TOL_LIBRARY} )
+endif( WIN32 )
 
 message( STATUS "TOLTCL_DEST_DIR = ${TOLTCL_DEST_DIR}" )