-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(#17933) gtsam: add v4.2.0a9, update package options
* gtsam: add missing Boost::program_options requirement See https://github.com/borglab/gtsam/blob/4.1.1/cmake/HandleBoost.cmake#L26 * gtsam: add transitive_headers/libs to deps * gtsam: drop test_v1_package * gtsam: backport a patch for C++17 compatibility * gtsam: add v4.2.0a9 https://github.com/borglab/gtsam/releases/tag/4.2a9 * gtsam: update package options - Covers all options that could be found in GTSAM build scripts. - Added links to source code since they are hard to find otherwise. - Added `allow_deprecated` option and deprecated `allow_deprecated_since_V4` as the wording of the GTSAM variable keeps changing but the meaning has stayed the same. - Added vars: GTSAM_DEFAULT_ALLOCATOR GTSAM_SLOW_BUT_CORRECT_BETWEENFACTOR GTSAM_USE_SYSTEM_METIS GTSAM_MEX_BUILD_STATIC_MODULE * gtsam: tweak formatting * gtsam: get rid of a duplicate patch * gtsam: handle `build_type_postfixes` option correctly * gtsam: correct metis lib name in 4.0 * gtsam: correct build_type_postfixes behavior * gtsam: fix a bug in 4.2.0a9 * gtsam: add 'lib' prefix to libraries on Windows * gtsam: add patch_source info to conandata.yml * gtsam: apply "lib" prefix on Windows correctly * gtsam: drop v4.0.2 To limit the load on CI. Superseded by v4.0.3. * gtsam: update onetbb and boost versions onetbb/2020.3 did not support Conan v2. * gtsam: better TBB validation * gtsam: add tcmalloc support with gperftools * gtsam: fix Eigen version check * gtsam: enable shared builds on Windows for v4.2 * gtsam: shared builds on Windows are broken in v4.2.0a9 * gtsam: document options with options_description * gtsam: add use_vendored_metis option * gtsam: simplify Conan v1 boilerplate * gtsam: improve default_allocator handling * gtsam: remove use_vendored_metis option It no longer builds with the new metis recipe. --------- Co-authored-by: Francisco Ramírez <franchuti688@gmail.com>
- Loading branch information
1 parent
89e0b7b
commit bc1eb90
Showing
13 changed files
with
348 additions
and
253 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
Large diffs are not rendered by default.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
File renamed without changes.
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,21 @@ | ||
| Otherwise the Eigen version detection will fail due to the Eigen path variable containing a generator expression. | ||
| diff --git a/cmake/HandleEigen.cmake b/cmake/HandleEigen.cmake | ||
| --- a/cmake/HandleEigen.cmake | ||
| +++ b/cmake/HandleEigen.cmake | ||
| @@ -46,6 +46,8 @@ | ||
| endif() | ||
|
|
||
| # Detect Eigen version: | ||
| +set(GTSAM_EIGEN_VERSION "${Eigen3_VERSION_STRING}") | ||
| +if (FALSE) | ||
| set(EIGEN_VER_H "${GTSAM_EIGEN_INCLUDE_FOR_BUILD}/Eigen/src/Core/util/Macros.h") | ||
| if (EXISTS ${EIGEN_VER_H}) | ||
| file(READ "${EIGEN_VER_H}" STR_EIGEN_VERSION) | ||
| @@ -67,6 +69,7 @@ | ||
| else() | ||
| message(WARNING "Cannot determine Eigen version, missing file: `${EIGEN_VER_H}`") | ||
| endif () | ||
| +endif() | ||
|
|
||
| if (MSVC) | ||
| if (BUILD_SHARED_LIBS) |
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,30 @@ | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -5,5 +5,4 @@ cmake_minimum_required(VERSION 3.0) | ||
| if(NOT DEFINED CMAKE_MACOSX_RPATH) | ||
| - set(CMAKE_MACOSX_RPATH 0) | ||
| endif() | ||
|
|
||
| # Set the version number for the library | ||
| --- a/cmake/HandleGlobalBuildFlags.cmake | ||
| +++ b/cmake/HandleGlobalBuildFlags.cmake | ||
| @@ -20,7 +20,6 @@ endif() | ||
|
|
||
| if (APPLE AND BUILD_SHARED_LIBS) | ||
| # Set the default install directory on macOS | ||
| - set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") | ||
| endif() | ||
|
|
||
| ############################################################################### | ||
| --- a/gtsam/3rdparty/metis/libmetis/CMakeLists.txt | ||
| +++ b/gtsam/3rdparty/metis/libmetis/CMakeLists.txt | ||
| @@ -17,9 +17,6 @@ if(WIN32) | ||
| endif() | ||
|
|
||
| if (APPLE) | ||
| - set_target_properties(metis-gtsam PROPERTIES | ||
| - INSTALL_NAME_DIR | ||
| - "${CMAKE_INSTALL_PREFIX}/lib") | ||
| endif() | ||
|
|
||
| install(TARGETS metis-gtsam EXPORT GTSAM-exports |
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,20 @@ | ||
| diff --git a/cmake/HandleEigen.cmake b/cmake/HandleEigen.cmake | ||
| --- a/cmake/HandleEigen.cmake | ||
| +++ b/cmake/HandleEigen.cmake | ||
| @@ -59,6 +59,8 @@ | ||
| endif() | ||
|
|
||
| # Detect Eigen version: | ||
| +set(GTSAM_EIGEN_VERSION "${Eigen3_VERSION_STRING}") | ||
| +if (FALSE) | ||
| set(EIGEN_VER_H "${GTSAM_EIGEN_INCLUDE_FOR_BUILD}/Eigen/src/Core/util/Macros.h") | ||
| if (EXISTS ${EIGEN_VER_H}) | ||
| file(READ "${EIGEN_VER_H}" STR_EIGEN_VERSION) | ||
| @@ -80,6 +82,7 @@ | ||
| else() | ||
| message(WARNING "Cannot determine Eigen version, missing file: `${EIGEN_VER_H}`") | ||
| endif () | ||
| +endif() | ||
|
|
||
| if (MSVC) | ||
| if (BUILD_SHARED_LIBS) |
12 changes: 12 additions & 0 deletions
12
recipes/gtsam/all/patches/4.2.0a9-0001-fix-invalid-include.patch
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,12 @@ | ||
| diff --git a/gtsam/sfm/DsfTrackGenerator.h b/gtsam/sfm/DsfTrackGenerator.h | ||
| --- a/gtsam/sfm/DsfTrackGenerator.h (revision c57988fe554e7213c77fe379c1d7c483de26ad33) | ||
| +++ b/gtsam/sfm/DsfTrackGenerator.h (revision 26a37d62103a9b3b828d36e8b1a76f875ed842e3) | ||
| @@ -22,7 +22,7 @@ | ||
|
|
||
| #include <Eigen/Core> | ||
| #include <map> | ||
| -#include <optional> | ||
| +#include <boost/optional.hpp> | ||
| #include <vector> | ||
|
|
||
| namespace gtsam { |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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,7 +1,7 @@ | ||
| versions: | ||
| "4.2.0a9": | ||
| folder: all | ||
| "4.1.1": | ||
| folder: all | ||
| "4.0.3": | ||
| folder: all | ||
| "4.0.2": | ||
| folder: all |