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

Merge branch 'release/2.4.0'

release/4.3a0
Richard Roberts 2014-02-23 16:05:38 -05:00
parent 6a0f2e9b88 ec930cb796
commit ac186a0ae4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtsam/3rdparty/CMakeLists.txt vendored
View File

@ -25,4 +25,6 @@ if(NOT GTSAM_USE_SYSTEM_EIGEN)
FILES_MATCHING PATTERN "*.h")
endif()
############ NOTE: When updating GeographicLib be sure to disable building their examples
############ by commenting out their line add_subdirectory (examples).
add_subdirectory(GeographicLib)

8
gtsam/3rdparty/GeographicLib/CMakeLists.txt vendored
View File

@ -341,10 +341,10 @@ add_subdirectory (man)
add_subdirectory (doc)
add_subdirectory (matlab)
add_subdirectory (python/geographiclib)
if (GEOGRAPHICLIB_PRECISION EQUAL 2)
# The examples assume double precision
add_subdirectory (examples)
endif ()
# if (GEOGRAPHICLIB_PRECISION EQUAL 2)
# # The examples assume double precision
# add_subdirectory (examples)
# endif ()
if (BUILD_NETGEOGRAPHICLIB)
set (NETGEOGRAPHICLIB_LIBRARIES NETGeographicLib)
set (NETLIBNAME NETGeographic)