Skip to content

Commit

Permalink
update blt to pick up fix that disables cmake rpath settings for stat…
Browse files Browse the repository at this point in the history
…ic builds (#216)

* update blt, use rpath settings from blt
  • Loading branch information
cyrush committed Sep 20, 2017
1 parent afd7ee8 commit dee8ba1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 25 deletions.
2 changes: 1 addition & 1 deletion src/blt
24 changes: 0 additions & 24 deletions src/cmake/CMakeBasics.cmake
Expand Up @@ -97,30 +97,6 @@ else()
message(STATUS "Building without coverage flags (ENABLE_COVERAGE == OFF)")
endif()

######################################
# RPath Settings for Shared Libs Case
######################################
if(BUILD_SHARED_LIBS)
# use, i.e. don't skip the full RPATH for the build tree
SET(CMAKE_SKIP_BUILD_RPATH FALSE)

# when building, don't use the install RPATH already
# (but later on when installing)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")

# add the automatically determined parts of the RPATH
# which point to directories outside the build tree to the install RPATH
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

# the RPATH to be used when installing, but only if it's not a system directory
list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
"${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
if("${isSystemDir}" STREQUAL "-1")
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
endif()
endif()

################################
# Standard CTest Options
Expand Down

0 comments on commit dee8ba1

Please sign in to comment.