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

Merge branch 'origin/develop'

release/4.3a0
Richard Roberts 2014-02-24 11:58:39 -05:00
parent e9eb706786 7105c31e5f
commit 7cd30a46e7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,15 +109,15 @@ endif ()
set_property (CACHE GEOGRAPHICLIB_LIB_TYPE set_property (CACHE GEOGRAPHICLIB_LIB_TYPE
PROPERTY STRINGS "SHARED" "STATIC" "BOTH") PROPERTY STRINGS "SHARED" "STATIC" "BOTH")
if (GEOGRAPHICLIB_LIB_TYPE STREQUAL "BOTH") if ("${GEOGRAPHICLIB_LIB_TYPE}" STREQUAL "BOTH")
set (GEOGRAPHICLIB_SHARED_LIB ON) set (GEOGRAPHICLIB_SHARED_LIB ON)
set (GEOGRAPHICLIB_STATIC_LIB ON) set (GEOGRAPHICLIB_STATIC_LIB ON)
set (GEOGRAPHICLIB_LIB_TYPE_VAL 2) set (GEOGRAPHICLIB_LIB_TYPE_VAL 2)
elseif (GEOGRAPHICLIB_LIB_TYPE STREQUAL "SHARED") elseif ("${GEOGRAPHICLIB_LIB_TYPE}" STREQUAL "SHARED")
set (GEOGRAPHICLIB_SHARED_LIB ON) set (GEOGRAPHICLIB_SHARED_LIB ON)
set (GEOGRAPHICLIB_STATIC_LIB OFF) set (GEOGRAPHICLIB_STATIC_LIB OFF)
set (GEOGRAPHICLIB_LIB_TYPE_VAL 1) set (GEOGRAPHICLIB_LIB_TYPE_VAL 1)
elseif (GEOGRAPHICLIB_LIB_TYPE STREQUAL "STATIC") elseif ("${GEOGRAPHICLIB_LIB_TYPE}" STREQUAL "STATIC")
set (GEOGRAPHICLIB_SHARED_LIB OFF) set (GEOGRAPHICLIB_SHARED_LIB OFF)
set (GEOGRAPHICLIB_STATIC_LIB ON) set (GEOGRAPHICLIB_STATIC_LIB ON)
set (GEOGRAPHICLIB_LIB_TYPE_VAL 0) set (GEOGRAPHICLIB_LIB_TYPE_VAL 0)