From efbe0b2d7045f6cab45ec0914f4050d1175ce26a Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 11 Jul 2022 16:57:52 -0700 Subject: [PATCH] Greedy ign- migrations Signed-off-by: methylDragon --- .github/workflows/macos.yml | 2 +- CMakeLists.txt | 4 ++-- configure.bat | 24 ------------------------ src/FrameSemantics.cc | 2 +- 4 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 configure.bat diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index cb6dcc80e..36c362329 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -32,7 +32,7 @@ jobs: popd echo '# END SECTION' fi - # ignition-math7 has problems with swig, remove it for now + # gz-math7 has problems with swig, remove it for now brew remove swig || true brew install --only-dependencies ${PACKAGE}; diff --git a/CMakeLists.txt b/CMakeLists.txt index a0646f9ac..0576df387 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,8 +36,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) if (BUILD_SDF) gz_configure_project( - NO_GZ_PREFIX - REPLACE_GZ_INCLUDE_PATH sdf + NO_PROJECT_PREFIX + REPLACE_INCLUDE_PATH sdf VERSION_SUFFIX pre1) ################################################# diff --git a/configure.bat b/configure.bat deleted file mode 100644 index 92b2bbad4..000000000 --- a/configure.bat +++ /dev/null @@ -1,24 +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% :install_ign_project ign-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 diff --git a/src/FrameSemantics.cc b/src/FrameSemantics.cc index 0b15cd9ba..0f22e111b 100644 --- a/src/FrameSemantics.cc +++ b/src/FrameSemantics.cc @@ -52,7 +52,7 @@ void printGraph(const ScopedGraph &_graph) std::cout << _graph.Graph() << std::endl; } -// The following two functions were originally submitted to ign-math, +// The following two functions were originally submitted to gz-math, // but were not accepted as they were not generic enough. // For now, they will be kept here. // https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-math/pull-requests/333