Changeset 0463dc72 in tol

Timestamp:

Jan 7, 2016, 12:46:50 PM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

f584d30

Parents:

1bebe88

Message:

Refs #1860
Se incorpora un RPATH a los binarios en Linux para que localicen las librerías sin necesidad de ejecutar un script estableciendo LD_LIBRARY_PATH.

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

Files:

• rtol/source/CMakeLists.txt (modified) (1 diff)
• tol/CMakeLists.txt (modified) (2 diffs)
• tolbase/generic/CMakeLists.txt (modified) (1 diff)
• toltcl/generic/CMakeLists.txt (modified) (2 diffs)

rtol/source/CMakeLists.txt

@@ -8 +8 @@
 message( STATUS "Using RINSIDE_INCLUDE_DIRS = ${RINSIDE_INCLUDE_DIRS}" )
 
-SET(CMAKE_INSTALL_RPATH "$ORIGIN")
-
+if( UNIX )
+  SET(CMAKE_INSTALL_RPATH "$ORIGIN")
+endif( UNIX )
 add_library( tolRlink SHARED tolRlink.cpp )
 

tol/CMakeLists.txt

@@ -423 +423 @@
 #  endif( )
 endforeach( )
+if( UNIX )
+  SET(CMAKE_INSTALL_RPATH "$ORIGIN") 
+endif( UNIX )
 add_library( tol SHARED ${TOL_SUBLIBRARIES} )
 if( WIN32 )
@@ -434 +437 @@
   ${PLATFORM_LIBRARIES} ${LAPACK_LIBRARIES} )
 
+if( UNIX )
+  SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib") 
+endif( UNIX )
 add_executable( tolcon tol.cpp )
 target_link_libraries( tolcon tol )

tolbase/generic/CMakeLists.txt

@@ -22 +22 @@
 endif(MINGW)
 
+if( UNIX )
+  SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
+endif( UNIX )
 add_executable( tolbase tolbase.c ${RES_FILES})
 

toltcl/generic/CMakeLists.txt

@@ -9 +9 @@
 message( STATUS "Using TCL_LIBRARY = ${TCL_LIBRARY}" )
 
+if( UNIX )
+  SET(CMAKE_INSTALL_RPATH "$ORIGIN/..") 
+endif( UNIX )
 add_library( toltcl SHARED
   crash.c toltcl.c pool.cpp tclutils.cpp tolaccess.cpp tolsergrp.cpp 
@@ -27 +30 @@
 endif( WIN32 )
 
+if( UNIX )
+  SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib") 
+endif( UNIX )
 add_executable( tolsh tolsh.c )
 if( WIN32 )