12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #198 from borglab/cmake-include 

CMake include improvements for macOS
release/4.3a0
Frank Dellaert 2019-12-22 19:38:52 -05:00 committed by GitHub
parent 662e5acbd5 1f6c1dfb85
commit 97297d874d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -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 list_append_cache(GTSAM_COMPILE_OPTIONS_PRIVATE "/wd4244") # Disable loss of precision which is thrown all over our Eigen
endif() 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 # Global compile options

2
cmake/GtsamMakeConfigFile.cmake
View File

@ -15,7 +15,7 @@ function(GtsamMakeConfigFile PACKAGE_NAME)
get_filename_component(name "${ARGV1}" NAME_WE) get_filename_component(name "${ARGV1}" NAME_WE)
set(EXTRA_FILE "${name}.cmake") set(EXTRA_FILE "${name}.cmake")
configure_file(${ARGV1} "${PROJECT_BINARY_DIR}/${EXTRA_FILE}" @ONLY) 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() else()
set(EXTRA_FILE "_does_not_exist_") set(EXTRA_FILE "_does_not_exist_")
endif() endif()

10
gtsam/CMakeLists.txt
View File

@ -153,7 +153,7 @@ if(GTSAM_SUPPORT_NESTED_DISSECTION)
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/gtsam/3rdparty/metis/include> $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/gtsam/3rdparty/metis/include>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/gtsam/3rdparty/metis/libmetis> $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/gtsam/3rdparty/metis/libmetis>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/gtsam/3rdparty/metis/GKlib> $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/gtsam/3rdparty/metis/GKlib>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/gtsam/3rdparty/metis/> $<INSTALL_INTERFACE:include/gtsam/3rdparty/metis/>
) )
endif() endif()
@ -168,16 +168,10 @@ if(WIN32) # Add 'lib' prefix to static library to avoid filename collision with
set_target_properties(gtsam PROPERTIES set_target_properties(gtsam PROPERTIES
PREFIX "" PREFIX ""
DEFINE_SYMBOL GTSAM_EXPORTS DEFINE_SYMBOL GTSAM_EXPORTS
RUNTIME_OUTPUT_DIRECTORY "${GTSAM_BINARY_DIR}/bin") RUNTIME_OUTPUT_DIRECTORY "${GTSAM_BINARY_DIR}/bin")
endif() endif()
endif() endif()
if (APPLE AND BUILD_SHARED_LIBS)
set_target_properties(gtsam PROPERTIES
INSTALL_NAME_DIR
"${CMAKE_INSTALL_PREFIX}/lib")
endif()
install( install(
TARGETS gtsam TARGETS gtsam
EXPORT GTSAM-exports EXPORT GTSAM-exports