From dee8ba1011ce8862bdaef1d599d6d59db1df9880 Mon Sep 17 00:00:00 2001 From: Cyrus Harrison Date: Wed, 20 Sep 2017 16:37:15 -0700 Subject: [PATCH] update blt to pick up fix that disables cmake rpath settings for static builds (#216) * update blt, use rpath settings from blt --- src/blt | 2 +- src/cmake/CMakeBasics.cmake | 24 ------------------------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/blt b/src/blt index 7eb10d309..f072a3673 160000 --- a/src/blt +++ b/src/blt @@ -1 +1 @@ -Subproject commit 7eb10d3095c0ede6a1bd6a0fb38cdddb18a1dac9 +Subproject commit f072a36736d6fb088ba8441419c58ed5f27d531d diff --git a/src/cmake/CMakeBasics.cmake b/src/cmake/CMakeBasics.cmake index 240a5c485..cbf83143f 100644 --- a/src/cmake/CMakeBasics.cmake +++ b/src/cmake/CMakeBasics.cmake @@ -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