Merge lp:~zorba-coders/zorba/rpath-fix into lp:zorba

Proposed by Chris Hillery on 2012-05-22
Status: Merged
Approved by: Matthias Brantner on 2012-05-22
Approved revision: 10863
Merged at revision: 10862
Proposed branch: lp:~zorba-coders/zorba/rpath-fix
Merge into: lp:zorba
Diff against target: 24 lines (+3/-0)
2 files modified
CMakeLists.txt (+1/-0)
src/CMakeLists.txt (+2/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/rpath-fix
Reviewer Review Type Date Requested Status
Matthias Brantner 2012-05-22 Approve on 2012-05-22
Chris Hillery Approve on 2012-05-22
Review via email: mp+106733@code.launchpad.net

Commit message

Set CMAKE_INSTALL_RPATH_USE_LINK_PATH to TRUE to have correct RPATHs in installed binaries. Add comment about INSTALL_NAME_DIR.

To post a comment you must log in.
Chris Hillery (ceejatec) :
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job rpath-fix-2012-05-22T01-50-56.402Z is finished. The final status was:

All tests succeeded!

Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job rpath-fix-2012-05-22T15-50-47.562Z is finished. The final status was:

All tests succeeded!

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 2012-05-17 09:43:03 +0000
3+++ CMakeLists.txt 2012-05-22 01:55:22 +0000
4@@ -65,6 +65,7 @@
5
6 # Enable RPaths in installed binaries
7 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
8+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
9
10 # turn on the folder grouping used by IDEs (VS or XCode)
11 SET(ZORBA_USE_TARGET_FOLDERS ON CACHE BOOL "Activate use of target grouping into folders")
12
13=== modified file 'src/CMakeLists.txt'
14--- src/CMakeLists.txt 2012-05-03 12:31:51 +0000
15+++ src/CMakeLists.txt 2012-05-22 01:55:22 +0000
16@@ -227,6 +227,8 @@
17
18 SET_TARGET_PROPERTIES(zorba_${ZORBA_STORE_NAME} PROPERTIES VERSION ${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
19 SET_TARGET_PROPERTIES(zorba_${ZORBA_STORE_NAME} PROPERTIES CLEAN_DIRECT_OUTPUT 0)
20+# INSTALL_NAME_DIR is a MacOS X-specific property that causes the
21+# "install_name" property of binaries to be corrected at "make install" time.
22 SET_TARGET_PROPERTIES(zorba_${ZORBA_STORE_NAME} PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
23
24 #

Subscribers

People subscribed via source and target branches