gtsam: add v4.2.0a9, update package options #17933
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
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) |
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 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 | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@valgur I realized that the official version is
4.2a9, should not it be better to put the same one? Am I missing something?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I based it on the full version number in CMakeLists.txt: https://github.com/borglab/gtsam/blob/4.2a9/CMakeLists.txt#L10-L13
My reasoning was that the official release is going to be
4.2.0, so this would be slightly more consistent and would avoid potential ambiguity when sorting the version numbers.I don't have anything against renaming it to
4.2a9either, though.