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

GeographicLib now works on Windows

release/4.3a0
Chris Beall 2014-05-03 17:26:07 -04:00
parent 219b2b4db7
commit 2daeae2438
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtsam/navigation/GPSFactor.h
View File

@ -31,7 +31,7 @@ namespace gtsam {
* See Farrell08book or e.g. http://www.dirsig.org/docs/new/coordinates.html * See Farrell08book or e.g. http://www.dirsig.org/docs/new/coordinates.html
* @addtogroup Navigation * @addtogroup Navigation
*/ */
class GPSFactor: public NoiseModelFactor1<Pose3> { class GTSAM_EXPORT GPSFactor: public NoiseModelFactor1<Pose3> {
private: private:

10
gtsam/navigation/tests/CMakeLists.txt
View File

@ -7,12 +7,22 @@ set(tests_excluded "")
if(GTSAM_INSTALL_GEOGRAPHICLIB) if(GTSAM_INSTALL_GEOGRAPHICLIB)
# If we're installing GeographicLib, use the one we're compiling # If we're installing GeographicLib, use the one we're compiling
include_directories(${PROJECT_SOURCE_DIR}/gtsam/3rdparty/GeographicLib/include) include_directories(${PROJECT_SOURCE_DIR}/gtsam/3rdparty/GeographicLib/include)
if(MSVC)
list(APPEND test_link_libraries GeographicLib_STATIC)
else()
list(APPEND test_link_libraries GeographicLib) list(APPEND test_link_libraries GeographicLib)
endif()
else() else()
if(GEOGRAPHICLIB_FOUND) if(GEOGRAPHICLIB_FOUND)
# If we're not installing, but it's already installed, use the installed one # If we're not installing, but it's already installed, use the installed one
include_directories(${GeographicLib_INCLUDE_DIRS}) include_directories(${GeographicLib_INCLUDE_DIRS})
list(APPEND test_link_libraries )
#if(MSVC)
# list(APPEND test_link_libraries GeographicLib_STATIC)
#else()
list(APPEND test_link_libraries ${GeographicLib_LIBRARIES}) list(APPEND test_link_libraries ${GeographicLib_LIBRARIES})
#endif()
else() else()
# We don't have GeographicLib # We don't have GeographicLib
set(tests_excluded testGeographicLib.cpp testGPSFactor.cpp testMagFactor.cpp) set(tests_excluded testGeographicLib.cpp testGPSFactor.cpp testMagFactor.cpp)