Changeset da2804ff in tol

Timestamp:

Dec 15, 2015, 1:12:10 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

22dc70e

Parents:

59323be

Message:

cambiamos /bin/sh por /bin/bash, eliminamos el uso de RPATH ya que los scripts de arranque establecen LD_LIBRARY_PATH

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

Location:

toltcl

Files:

• bin/tolsh.sh (modified) (1 diff)
• generic/CMakeLists.txt (modified) (1 diff)

toltcl/bin/tolsh.sh

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 # Shell wrapper for TOL executable.
 

toltcl/generic/CMakeLists.txt

@@ -5 +5 @@
 message( STATUS "Using TCL_STUB_LIBRARY = ${TCL_STUB_LIBRARY}" )
 message( STATUS "Using TCL_LIBRARY = ${TCL_LIBRARY}" )
-
-if ( NOT WIN32 )
-        # 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")
-endif( NOT WIN32 )
 
 add_library( toltcl SHARED