Skip to content

Commit 115f64f

Browse files
committed
Add RPATH to binaries
1 parent 1e77d25 commit 115f64f

File tree

3 files changed

+10
-62
lines changed

3 files changed

+10
-62
lines changed

CMakeLists.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0)
44
project(Cadabra)
55
set(CADABRA_VERSION_MAJOR 2)
66
set(CADABRA_VERSION_MINOR 1)
7-
set(CADABRA_VERSION_PATCH 5)
7+
set(CADABRA_VERSION_PATCH 6)
88
set(COPYRIGHT_YEARS "2001-2017")
99
execute_process(COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE GIT_SHORT_SHA OUTPUT_STRIP_TRAILING_WHITESPACE)
1010
execute_process(COMMAND git rev-list --count HEAD OUTPUT_VARIABLE GIT_COMMIT_SERIAL OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -50,6 +50,15 @@ else()
5050
message("-- User mode")
5151
endif()
5252

53+
# Ensure that all installed binaries have an RPATH setting
54+
# which enables them to find libtexengine, libcadabra_client and
55+
# libcadabra_server without any ld.so.conf settings.
56+
57+
SET(CMAKE_SKIP_BUILD_RPATH FALSE)
58+
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
59+
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
60+
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
61+
5362
# Determine what type of system we are on, for packaging.
5463
set(LINUX_NAME "")
5564
if(EXISTS "/etc/redhat-release")

core/algorithms/decompose_product.tex

Lines changed: 0 additions & 30 deletions
This file was deleted.

core/algorithms/substitute.tex

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)