-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Added gtsam 4.1.1 * 4.1.1: Disable shared builds on MSVC * Added ref to GTSAM about missing MSVC support Co-authored-by: Chris Mc <prince.chrismc@gmail.com> * gtsam: Use tools.is_msvc Co-authored-by: Chris Mc <prince.chrismc@gmail.com>
- Loading branch information
1 parent
06927ee
commit 2083d54
Showing
5 changed files
with
72 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
diff --git a/cmake/HandleBoost.cmake b/cmake/HandleBoost.cmake | ||
--- a/cmake/HandleBoost.cmake | ||
+++ b/cmake/HandleBoost.cmake | ||
@@ -25,13 +25,7 @@ endif() | ||
set(BOOST_FIND_MINIMUM_VERSION 1.65) | ||
set(BOOST_FIND_MINIMUM_COMPONENTS serialization system filesystem thread program_options date_time timer chrono regex) | ||
|
||
-find_package(Boost ${BOOST_FIND_MINIMUM_VERSION} COMPONENTS ${BOOST_FIND_MINIMUM_COMPONENTS}) | ||
- | ||
-# Required components | ||
-if(NOT Boost_SERIALIZATION_LIBRARY OR NOT Boost_SYSTEM_LIBRARY OR NOT Boost_FILESYSTEM_LIBRARY OR | ||
- NOT Boost_THREAD_LIBRARY OR NOT Boost_DATE_TIME_LIBRARY) | ||
- message(FATAL_ERROR "Missing required Boost components >= v1.65, please install/upgrade Boost or configure your search paths.") | ||
-endif() | ||
+find_package(Boost ${BOOST_FIND_MINIMUM_VERSION} COMPONENTS ${BOOST_FIND_MINIMUM_COMPONENTS} REQUIRED) | ||
|
||
option(GTSAM_DISABLE_NEW_TIMERS "Disables using Boost.chrono for timing" OFF) | ||
# Allow for not using the timer libraries on boost < 1.48 (GTSAM timing code falls back to old timer library) | ||
@@ -47,7 +41,7 @@ if (GTSAM_DISABLE_NEW_TIMERS) | ||
message("WARNING: GTSAM timing instrumentation manually disabled") | ||
list_append_cache(GTSAM_COMPILE_DEFINITIONS_PUBLIC DGTSAM_DISABLE_NEW_TIMERS) | ||
else() | ||
- if(Boost_TIMER_LIBRARY) | ||
+ if(TARGET Boost::timer) | ||
list(APPEND GTSAM_BOOST_LIBRARIES Boost::timer Boost::chrono) | ||
else() | ||
list(APPEND GTSAM_BOOST_LIBRARIES rt) # When using the header-only boost timer library, need -lrt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -4,7 +4,6 @@ cmake_minimum_required(VERSION 3.0) | ||
# new feature to Cmake Version > 2.8.12 | ||
# Mac ONLY. Define Relative Path on Mac OS | ||
if(NOT DEFINED CMAKE_MACOSX_RPATH) | ||
- set(CMAKE_MACOSX_RPATH 0) | ||
endif() | ||
|
||
# Set the version number for the library | ||
diff --git a/gtsam/3rdparty/metis/libmetis/CMakeLists.txt b/gtsam/3rdparty/metis/libmetis/CMakeLists.txt | ||
--- a/gtsam/3rdparty/metis/libmetis/CMakeLists.txt | ||
+++ b/gtsam/3rdparty/metis/libmetis/CMakeLists.txt | ||
@@ -16,12 +16,6 @@ if(WIN32) | ||
RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/../../../bin") | ||
endif() | ||
|
||
-if (APPLE) | ||
- set_target_properties(metis-gtsam PROPERTIES | ||
- INSTALL_NAME_DIR | ||
- "${CMAKE_INSTALL_PREFIX}/lib") | ||
- endif() | ||
- | ||
install(TARGETS metis-gtsam EXPORT GTSAM-exports | ||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,6 @@ | ||
versions: | ||
"4.1.1": | ||
folder: all | ||
"4.0.3": | ||
folder: all | ||
"4.0.2": | ||
|