Switchboard

Merge lp:~shnatsel/switchboard/fix-rpath into lp:~elementary-pantheon/switchboard/switchboard

  1. fix-rpath
  2. Merge into switchboard
Proposed by Sergey "Shnatsel" Davidoff
Status: Merged
Approved by: Sergey "Shnatsel" Davidoff
Approved revision: 471
Merged at revision: 470
Proposed branch: lp:~shnatsel/switchboard/fix-rpath
Merge into: lp:~elementary-pantheon/switchboard/switchboard
Diff against target: 16 lines (+6/-0)
1 file modified
CMakeLists.txt (+6/-0)
To merge this branch: bzr merge lp:~shnatsel/switchboard/fix-rpath
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+229212@code.launchpad.net

Description of the change

Do not set RPATH (shared library search path) during build.

This makes Switchboard able to load plugs installed in the system when it's running from the source code tree.

This is also required for packaging Switchboard for Debian, see https://wiki.debian.org/RpathIssue

To post a comment you must log in.
lp:~shnatsel/switchboard/fix-rpath updated
471. By Sergey "Shnatsel" Davidoff

Space! Space! So much space!

Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

Rubberstamped by tintou.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-07-08 15:13:25 +0000
3+++ CMakeLists.txt 2014-08-01 13:18:19 +0000
4@@ -29,6 +29,12 @@
5 message ("-- Shared libraries disabled")
6 endif ()
7
8+# Do not override library search path, so that plugs can be loaded to even if
9+# Switchboard is run from the source code tree.
10+# This is also required by Debian policy,
11+# see http://wiki.debian.org/RpathIssue for details
12+set (CMAKE_SKIP_BUILD_RPATH TRUE)
13+
14 #
15
16 # Niceties

Subscribers

People subscribed via source and target branches