upgraded to new version 1.40 and fixed cmake issues, hopefully once a…

…nd for all times.

CMakeLists.txt

@@ -12,11 +12,11 @@ file(MAKE_DIRECTORY ${CATKIN_DEVEL_PREFIX}/include)
 
 ExternalProject_Add(
     GeographicLib
-    URL http://downloads.sourceforge.net/project/geographiclib/distrib/GeographicLib-1.34.tar.gz
+    URL http://downloads.sourceforge.net/project/geographiclib/distrib/GeographicLib-1.40.tar.gz
     PATCH_COMMAND mkdir -p ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}/data
-    CONFIGURE_COMMAND cd ${CATKIN_DEVEL_PREFIX}/../build/geographic_lib/GeographicLib-prefix/src/GeographicLib && cmake -D CMAKE_INSTALL_PREFIX=${CATKIN_DEVEL_PREFIX} -D GEOGRAPHICLIB_DATA=${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}/data .
-    BUILD_COMMAND cd ${CATKIN_DEVEL_PREFIX}/../build/geographic_lib/GeographicLib-prefix/src/GeographicLib && make -j1
-    INSTALL_COMMAND cd ${CATKIN_DEVEL_PREFIX}/../build/geographic_lib/GeographicLib-prefix/src/GeographicLib && make install && 
+    CONFIGURE_COMMAND cd ${CMAKE_BINARY_DIR}/GeographicLib-prefix/src/GeographicLib && cmake -D CMAKE_INSTALL_PREFIX=${CATKIN_DEVEL_PREFIX} -D GEOGRAPHICLIB_DATA=${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}/data .
+    BUILD_COMMAND cd ${CMAKE_BINARY_DIR}/GeographicLib-prefix/src/GeographicLib && make -j1
+    INSTALL_COMMAND cd ${CMAKE_BINARY_DIR}/GeographicLib-prefix/src/GeographicLib && make install && 
         ./tools/geographiclib-get-geoids -p ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}/data best &&
         ./tools/geographiclib-get-gravity -p ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}/data all &&
         ./tools/geographiclib-get-magnetic -p ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}/data all