Skip to content

Commit bc674a4

Browse files
committed
GeographicLib from gtsam
1 parent a36e89a commit bc674a4

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

.github/scripts/unix.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ function configure()
5555
-DGTSAM_USE_BOOST_FEATURES=${GTSAM_USE_BOOST_FEATURES:-OFF} \
5656
-DGTSAM_ENABLE_BOOST_SERIALIZATION=${GTSAM_ENABLE_BOOST_SERIALIZATION:-OFF} \
5757
-DGTSAM_BUILD_WITH_MARCH_NATIVE=OFF \
58-
-DGTSAM_SINGLE_TEST_EXE=${GTSAM_SINGLE_TEST_EXE:-OFF}
58+
-DGTSAM_SINGLE_TEST_EXE=${GTSAM_SINGLE_TEST_EXE:-OFF} \
59+
-DGTSAM_INSTALL_GEOGRAPHICLIB=${GTSAM_INSTALL_GEOGRAPHICLIB:-OFF} \
60+
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD:-}
5961
}
6062

6163

.github/workflows/build-special.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@ jobs:
6363
version: "14"
6464
flag: tbb
6565

66+
- name: ubuntu-clang-geographiclib
67+
os: ubuntu-22.04
68+
compiler: clang
69+
version: "14"
70+
flag: geographiclib
71+
6672
- name: ubuntu-clang-cayleymap
6773
os: ubuntu-22.04
6874
compiler: clang
@@ -132,6 +138,13 @@ jobs:
132138
echo "GTSAM_WITH_TBB=ON" >> $GITHUB_ENV
133139
echo "GTSAM Uses TBB"
134140
141+
- name: Set GTSAM_INSTALL_GEOGRAPHICLIB Flag
142+
if: matrix.flag == 'geographiclib'
143+
run: |
144+
echo "GTSAM_INSTALL_GEOGRAPHICLIB=ON" >> $GITHUB_ENV
145+
echo "CMAKE_CXX_STANDARD=14" >> $GITHUB_ENV
146+
echo "GTSAM Uses GeographicLib"
147+
135148
- name: Use Cayley Transform for Rot3
136149
if: matrix.flag == 'cayley'
137150
run: |

gtsam/3rdparty/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if(GEOGRAPHICLIB_FOUND AND GTSAM_INSTALL_GEOGRAPHICLIB)
8181
endif()
8282

8383
if(GTSAM_INSTALL_GEOGRAPHICLIB)
84-
add_subdirectory(GeographicLib)
84+
add_subdirectory(GeographicLib EXCLUDE_FROM_ALL)
8585
endif()
8686

8787
set(GTSAM_EXPORTED_TARGETS "${GTSAM_EXPORTED_TARGETS}" PARENT_SCOPE)

0 commit comments

Comments
 (0)