Always turn on CMake RPATH logic...

...because the old behavior is just broken. This has the effect of enabling CMP0042¹ for all externals, without needing to modify them. (¹ https://cmake.org/cmake/help/v3.7/policy/CMP0042.html)
trigrass2 · Mar 23, 2017 · f3b4405 · f3b4405
1 parent 9adb2b5
commit f3b4405
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/cmake/config.cmake b/cmake/config.cmake
@@ -252,6 +252,7 @@ macro(drake_setup_platform)
   mark_as_advanced(LIB_SUFFIX)
 
   # Set RPATH for installed binaries
+  set(CMAKE_MACOSX_RPATH ON)
   set(CMAKE_INSTALL_RPATH
     ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
     ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}

diff --git a/cmake/externals.cmake b/cmake/externals.cmake
@@ -175,6 +175,7 @@ macro(drake_add_cmake_external PROJECT)
     Java_JAVAH_EXECUTABLE
     Java_VERSION_STRING
     CMAKE_JAVA_COMPILE_FLAGS
+    CMAKE_MACOSX_RPATH
     CMAKE_INSTALL_RPATH
     CMAKE_INSTALL_RPATH_USE_LINK_PATH
     LIB_SUFFIX)