Changeset e64ad71 in tol for toltcl

Timestamp:

Feb 13, 2015, 4:11:47 PM (12 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

b89e483

Parents:

d008ac1

Message:

refs #1812, refs #1818, tolsh es parte de toltcl a partir de ahora

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

Location:

toltcl

Files:

• CMakeLists.txt (modified) (2 diffs)
• generic/CMakeLists.txt (modified) (2 diffs)
• generic/tolsh.c (added)
• library/CMakeLists.txt (modified) (1 diff)
• library/pkgIndex.tcl.in (modified) (1 diff)
• library/tolsh.tcl (added)

toltcl/CMakeLists.txt

@@ -22 +22 @@
 # look for tcl
 if ( WIN32 AND TOL_PREFIX_PATH )
+  set( TCL_LIBRARY_PATH "${TOL_PREFIX_PATH}/lib" )
   find_library( TCL_STUB_LIBRARY
       NAMES "libtclstub84" "libtclstub85" "libtclstub86"
-      PATHS "${TOL_PREFIX_PATH}/lib"
+      PATHS ${TCL_LIBRARY_PATH}
       NO_DEFAULT_PATH
     )
@@ -43 +44 @@
   message( STATUS ${TCL_STUB_LIBRARY} )
   message( STATUS ${TCL_INCLUDE_PATH} )
-  get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_INCLUDE_PATH} PATH )
+  message( STATUS ${TCL_LIBRARY_PATH} )
+  get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH} PATH )
   message( STATUS "Using CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )
 else( TCL_FOUND )

toltcl/generic/CMakeLists.txt

@@ -1 +1 @@
 add_definitions( -DBUILD_TOLTCL -DUSE_TCL_STUBS -DTCL_THREADS )
-include_directories( ${TCL_INCLUDE_PATH} )
-  
+include_directories( ${TCL_INCLUDE_PATH} ${TOL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
+ 
+message( STATUS "Using TCL_INCLUDE_PATH = ${TCL_INCLUDE_PATH}" )
+message( STATUS "Using TCL_STUB_LIBRARY = ${TCL_STUB_LIBRARY}" )
+message( STATUS "Using TCL_LIBRARY = ${TCL_LIBRARY}" )
+
+# use, i.e. don't skip the full RPATH for the build tree
+SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+
+# when building, don't use the install RPATH already
+# (but later on when installing)
+SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
+
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+
+# add the automatically determined parts of the RPATH
+# which point to directories outside the build tree to the install RPATH
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+
+# the RPATH to be used when installing, but only if it's not a system directory
+LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
+IF("${isSystemDir}" STREQUAL "-1")
+   SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+ENDIF("${isSystemDir}" STREQUAL "-1")
+
 add_library( toltcl SHARED
   crash.c toltcl.c pool.cpp tclutils.cpp tolaccess.cpp tolsergrp.cpp 
@@ -7 +31 @@
 )
 
-include_directories( ${TCL_INCLUDE_PATH} ${TOL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
-
-message( STATUS "Using TCL_INCLUDE_PATH = ${TCL_INCLUDE_PATH}" )
-message( STATUS "Using TCL_STUB_LIBRARY = ${TCL_STUB_LIBRARY}" )
 target_link_libraries( toltcl
   ${TCL_STUB_LIBRARY} ${TOL_LIBRARY} )
 
+add_executable( tolsh tolsh.c )
+target_link_libraries( tolsh ${TCL_LIBRARY} )
+
+install( TARGETS tolsh RUNTIME DESTINATION "bin" )
 if( WIN32 )
   install( TARGETS toltcl RUNTIME DESTINATION "${TOLTCL_DEST_DIR}" )

toltcl/library/CMakeLists.txt

@@ -12 +12 @@
   )
 
-install( FILES "${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl" toltcl.tcl
+install( FILES "${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl" toltcl.tcl tolsh.tcl
   COMPONENT RUNTIME DESTINATION "${TOLTCL_DEST_DIR}" )
 

toltcl/library/pkgIndex.tcl.in

@@ -25 +25 @@
     } ]
 
+package ifneeded TolshApp @TOLTCL_VERSION_MAJOR@.@TOLTCL_VERSION_MINOR@ \
+    [ string map [list %d $dir] {
+      source [ file join {%d} tolsh.tcl ]
+    } ]