From f50c3c0d51fa7f4d015ec84e5a536a0cc4ffd918 Mon Sep 17 00:00:00 2001 From: Simon Julier Date: Tue, 17 Jan 2017 16:53:28 +0000 Subject: [PATCH] Use INSTALL_NAME_DIR to embed names in the dylibs and avoid linker errors.y --- cmake/GtsamMatlabWrap.cmake | 3 ++- gtsam/CMakeLists.txt | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/GtsamMatlabWrap.cmake b/cmake/GtsamMatlabWrap.cmake index a9e04a01a..3165a307a 100644 --- a/cmake/GtsamMatlabWrap.cmake +++ b/cmake/GtsamMatlabWrap.cmake @@ -70,7 +70,8 @@ function(wrap_library_internal interfaceHeader linkLibraries extraIncludeDirs ex set(mexModuleExt mexglx) endif() elseif(APPLE) - set(mexModuleExt mexmaci64) + set(mexModuleExt mexmaci64) + set(CMAKE_INSTALL_DIR_NAME ${GTSAM_TOOLBOX_INSTALL_PATH}) elseif(MSVC) if(CMAKE_CL_64) set(mexModuleExt mexw64) diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt index 8c1d8bb43..63528d3b4 100644 --- a/gtsam/CMakeLists.txt +++ b/gtsam/CMakeLists.txt @@ -113,6 +113,10 @@ if (GTSAM_BUILD_STATIC_LIBRARY) PREFIX "lib" COMPILE_DEFINITIONS GTSAM_IMPORT_STATIC) endif() + if(APPLE) # Set the + set_target_properties(gtsam PROPERTIES + INSTALL_DIR_NAME ${CMAKE_INSTALL_PREFIX}/lib) + endif() install(TARGETS gtsam EXPORT GTSAM-exports ARCHIVE DESTINATION lib) list(APPEND GTSAM_EXPORTED_TARGETS gtsam) set(GTSAM_EXPORTED_TARGETS "${GTSAM_EXPORTED_TARGETS}" PARENT_SCOPE)