diff --git a/CMakeLists.txt b/CMakeLists.txt index 2af6341ea..4d2ee55e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -345,6 +345,11 @@ if (MSVC) list_append_cache(GTSAM_COMPILE_OPTIONS_PRIVATE "/wd4244") # Disable loss of precision which is thrown all over our Eigen endif() +if (APPLE AND BUILD_SHARED_LIBS) + # Set the default install directory on macOS + set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") +endif() + ############################################################################### # Global compile options diff --git a/cmake/GtsamMakeConfigFile.cmake b/cmake/GtsamMakeConfigFile.cmake index 2fff888ef..0479a2524 100644 --- a/cmake/GtsamMakeConfigFile.cmake +++ b/cmake/GtsamMakeConfigFile.cmake @@ -15,7 +15,7 @@ function(GtsamMakeConfigFile PACKAGE_NAME) get_filename_component(name "${ARGV1}" NAME_WE) set(EXTRA_FILE "${name}.cmake") configure_file(${ARGV1} "${PROJECT_BINARY_DIR}/${EXTRA_FILE}" @ONLY) - install(FILES "${PROJECT_BINARY_DIR}/${EXTRA_FILE}" DESTINATION "${CMAKE_INSTALL_PREFIX}/${DEF_INSTALL_CMAKE_DIR}") + install(FILES "${PROJECT_BINARY_DIR}/${EXTRA_FILE}" DESTINATION "${DEF_INSTALL_CMAKE_DIR}") else() set(EXTRA_FILE "_does_not_exist_") endif() diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt index 82cdf2bad..1079b845f 100644 --- a/gtsam/CMakeLists.txt +++ b/gtsam/CMakeLists.txt @@ -153,7 +153,7 @@ if(GTSAM_SUPPORT_NESTED_DISSECTION) $ $ $ - $ + $ ) endif() @@ -168,16 +168,10 @@ if(WIN32) # Add 'lib' prefix to static library to avoid filename collision with set_target_properties(gtsam PROPERTIES PREFIX "" DEFINE_SYMBOL GTSAM_EXPORTS - RUNTIME_OUTPUT_DIRECTORY "${GTSAM_BINARY_DIR}/bin") + RUNTIME_OUTPUT_DIRECTORY "${GTSAM_BINARY_DIR}/bin") endif() endif() -if (APPLE AND BUILD_SHARED_LIBS) - set_target_properties(gtsam PROPERTIES - INSTALL_NAME_DIR - "${CMAKE_INSTALL_PREFIX}/lib") -endif() - install( TARGETS gtsam EXPORT GTSAM-exports