File tree Expand file tree Collapse file tree 3 files changed +10
-62
lines changed Expand file tree Collapse file tree 3 files changed +10
-62
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0)
44project (Cadabra)
55set (CADABRA_VERSION_MAJOR 2)
66set (CADABRA_VERSION_MINOR 1)
7- set (CADABRA_VERSION_PATCH 5 )
7+ set (CADABRA_VERSION_PATCH 6 )
88set (COPYRIGHT_YEARS "2001-2017" )
99execute_process (COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE GIT_SHORT_SHA OUTPUT_STRIP_TRAILING_WHITESPACE)
1010execute_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" )
5151endif ()
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.
5463set (LINUX_NAME "" )
5564if (EXISTS "/etc/redhat-release" )
Load Diff This file was deleted.
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments