Remove configure.bat, export CXX_STANDARD (#387)

* Remove configure.bat and test fix for finding av * Set CXX_STANDARD for core library * Fix deprecation warnings Signed-off-by: Steve Peters <[email protected]>
gazebosim · Jul 6, 2022 · a714900 · a714900
1 parent 4416bee
commit a714900
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 28 deletions.
diff --git a/configure.bat b/configure.bat
diff --git a/geospatial/src/Dem.cc b/geospatial/src/Dem.cc
@@ -157,10 +157,10 @@ int Dem::Load(const std::string &_filename)
   {
     // If successful, set the world width and height
     this->dataPtr->worldWidth =
-       math::SphericalCoordinates::Distance(upLeftLat, upLeftLong,
+       math::SphericalCoordinates::DistanceWGS84(upLeftLat, upLeftLong,
                                               upRightLat, upRightLong);
     this->dataPtr->worldHeight =
-       math::SphericalCoordinates::Distance(upLeftLat, upLeftLong,
+       math::SphericalCoordinates::DistanceWGS84(upLeftLat, upLeftLong,
                                               lowLeftLat, lowLeftLong);
   }
   // Assume non-Earth DEM (e.g., moon)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -4,7 +4,8 @@ gz_get_libsources_and_unittests(sources gtest_sources)
 
 # Create the library target
 gz_create_core_library(
-  SOURCES ${sources})
+  SOURCES ${sources}
+  CXX_STANDARD ${CMAKE_CXX_STANDARD})
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
     set(CXX_FILESYSTEM_LIBRARIES stdc++fs)