Index: toltcl/CMakeLists.txt
===================================================================
--- toltcl/CMakeLists.txt	(revision b3f4e24b52cea418f5a350b2236eb19de7dd5401)
+++ toltcl/CMakeLists.txt	(revision 874ea8196355c1e5cde2746174efaede94827624)
@@ -54,4 +54,11 @@
 
 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} )
Index: toltcl/generic/CMakeLists.txt
===================================================================
--- toltcl/generic/CMakeLists.txt	(revision b3f4e24b52cea418f5a350b2236eb19de7dd5401)
+++ toltcl/generic/CMakeLists.txt	(revision 874ea8196355c1e5cde2746174efaede94827624)
@@ -16,9 +16,18 @@
 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}" )