vim/YouCompleteMe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

We now use @loader_path on Mac for libclang

Browse Source 
This makes sure that our local copy of libclang.dylib is preferred over the
system one.
This commit is contained in:
Strahinja Val Markovic 2013-01-13 12:51:09 -08:00
parent fa21622655
commit 0373fb254e
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cpp/ycm/CMakeLists.txt
View File

@ -79,10 +79,13 @@ if ( EXTERNAL_LIBCLANG_PATH OR USE_SYSTEM_LIBCLANG )
if ( USE_SYSTEM_LIBCLANG ) if ( USE_SYSTEM_LIBCLANG )
find_library( EXTERNAL_LIBCLANG_PATH clang ) find_library( EXTERNAL_LIBCLANG_PATH clang )
else() else()
# Setting this to true makes sure that libraries we build will have our rpath # For Macs, we do things differently; look further in this file.
# set even without having to do "make install" if ( NOT APPLE )
set( CMAKE_BUILD_WITH_INSTALL_RPATH TRUE ) # Setting this to true makes sure that libraries we build will have our rpath
set( CMAKE_INSTALL_RPATH "\$ORIGIN" ) # set even without having to do "make install"
set( CMAKE_BUILD_WITH_INSTALL_RPATH TRUE )
set( CMAKE_INSTALL_RPATH "\$ORIGIN" )
endif()
endif() endif()
set( LIBCLANG_TARGET ${EXTERNAL_LIBCLANG_PATH} ) set( LIBCLANG_TARGET ${EXTERNAL_LIBCLANG_PATH} )
@ -110,6 +113,27 @@ target_link_libraries( ${PROJECT_NAME}
${LIBCLANG_TARGET} ${LIBCLANG_TARGET}
) )
#############################################################################
# Things are a bit different on Macs when using an external libclang.dylib; here
# we want to make sure we use @loader_path/libclang.dylib instead of
# @rpath/libclang.dylib in the final ycm_core.so. If we use the @rpath version,
# then it may load the system libclang which the user explicitely does not want
# (otherwise the user would specify USE_SYSTEM_LIBCLANG). With @loader_path, we
# make sure that only the libclang.dylib present in the same directory as our
# ycm_core.so is used.
if ( EXTERNAL_LIBCLANG_PATH AND APPLE )
add_custom_command( TARGET ${PROJECT_NAME}
POST_BUILD
COMMAND install_name_tool
"-change"
"@rpath/libclang.dylib"
"@loader_path/libclang.dylib"
"$<TARGET_FILE:${PROJECT_NAME}>"
)
endif()
############################################################################# #############################################################################
# We don't want the "lib" prefix, it can screw up python when it tries to search # We don't want the "lib" prefix, it can screw up python when it tries to search