From 5f5addb24c07c06a992bc398b7488d416f5a8ed1 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Sat, 2 Jul 2022 23:46:28 -0700 Subject: [PATCH 1/3] Remove configure.bat and test fix for finding av Signed-off-by: Steve Peters --- configure.bat | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 configure.bat diff --git a/configure.bat b/configure.bat deleted file mode 100644 index 68582d494..000000000 --- a/configure.bat +++ /dev/null @@ -1,25 +0,0 @@ - -:: NOTE: This script is only meant to be used as part of the ignition developers' CI system -:: Users and developers should build and install this library using cmake and Visual Studio - - -:: Install dependencies -call %win_lib% :download_unzip_install dlfcn-win32-vc15-x64-dll-MD.zip -call %win_lib% :install_ign_project gz-math main - -:: Set configuration variables -@set build_type=Release -@if not "%1"=="" set build_type=%1 -@echo Configuring for build type %build_type% - -:: Go to the directory that this configure.bat file exists in -cd /d %~dp0 - -:: Create a build directory and configure -md build -cd build -cmake .. -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX="%WORKSPACE_INSTALL_DIR%" -DCMAKE_BUILD_TYPE="%build_type%" -DBUILD_TESTING:BOOL=False -:: Note: We disable testing by default. If the intention is for the CI to build and test -:: this project, then the CI script will turn it back on. - -:: If the caller wants to build and/or install, they should do so after calling this script From 0ca090651d05e2a7e3e5f55ad25c6315e6f3575f Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 5 Jul 2022 14:27:02 -0700 Subject: [PATCH 2/3] Set CXX_STANDARD for core library Signed-off-by: Steve Peters --- src/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 64748f060..0987b505e 100644 --- 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) From c58b3923b4677cb4240d6e58bf79b67b187746a6 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 5 Jul 2022 18:27:18 -0700 Subject: [PATCH 3/3] Fix deprecation warnings Signed-off-by: Steve Peters --- geospatial/src/Dem.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/geospatial/src/Dem.cc b/geospatial/src/Dem.cc index 664737e4c..d847d9bf5 100644 --- 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)