Skip to content

Commit 960ea1a

Browse files
daverigbytrondn
authored andcommitted
MB-16435: OS X: Add correct rpath for vbuckettool & vbucketkeygen
Add explicit runtime linker search paths to vbuckettool & vbucketkeygen so they can locate their runtime library dependancies without an external DYLD_LIBRARY_PATH being set (which is no longer possible from OS X 10.11 "El Capitan" onwards). Change-Id: I74bdaa24cad5d09fd6653ccca1e7278d29f8536b Reviewed-on: http://review.couchbase.org/55759 Tested-by: buildbot <[email protected]> Reviewed-by: Trond Norbye <[email protected]>
1 parent dae5237 commit 960ea1a

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

CMakeLists.txt

+11-1
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,19 @@ ADD_EXECUTABLE(moxi
205205

206206
TARGET_LINK_LIBRARIES(moxi conflate vbucket platform mcd ${LIBEVENT_LIBRARIES} ${COUCHBASE_NETWORK_LIBS} ${UMEM_LIBRARY})
207207

208-
INSTALL(TARGETS moxi vbucketkeygen vbuckettool
208+
INSTALL(TARGETS moxi
209209
RUNTIME DESTINATION bin)
210210

211+
INSTALL(TARGETS vbucketkeygen vbuckettool
212+
RUNTIME DESTINATION bin/tools)
213+
214+
IF (APPLE)
215+
# Tools are installed in bin/tools/; need to map from there to lib/
216+
SET_TARGET_PROPERTIES(vbucketkeygen vbuckettool
217+
PROPERTIES
218+
INSTALL_RPATH "@executable_path/../../lib")
219+
ENDIF ()
220+
211221
ADD_TEST(moxi-sizes moxi_sizes)
212222
ADD_TEST(moxi-htgram-test moxi_htgram_test)
213223

0 commit comments

Comments
 (0)