From bebbd6c422c16a49bfc638d136fdd09b493a0404 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 11 Jul 2022 16:59:22 -0700 Subject: [PATCH] Greedy ign- migrations Signed-off-by: methylDragon --- CMakeLists.txt | 2 +- plugins/sim_gui/SimGui.hh | 2 +- src/Manager_TEST.cc | 12 ++++++------ src/cmd/CMakeLists.txt | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b093eb6b..e14add93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) gz_configure_project( - REPLACE_GZ_INCLUDE_PATH gz/launch + REPLACE_INCLUDE_PATH gz/launch VERSION_SUFFIX) #============================================================================ diff --git a/plugins/sim_gui/SimGui.hh b/plugins/sim_gui/SimGui.hh index 327f05a1..81a214a9 100644 --- a/plugins/sim_gui/SimGui.hh +++ b/plugins/sim_gui/SimGui.hh @@ -41,7 +41,7 @@ namespace gz /// /// - /// + /// /// /// /// Custom window title diff --git a/src/Manager_TEST.cc b/src/Manager_TEST.cc index 740cc713..b2742249 100644 --- a/src/Manager_TEST.cc +++ b/src/Manager_TEST.cc @@ -30,10 +30,10 @@ class ManagerTest : public ::testing::Test public: ManagerTest(){} #ifndef _WIN32 - std::string testScriptPath = "/tmp/ign-launch.sh"; + std::string testScriptPath = "/tmp/gz-launch.sh"; #else std::string testScriptPath = - std::string(getenv("localappdata")) + "\\Temp\\ign-launch.bat"; + std::string(getenv("localappdata")) + "\\Temp\\gz-launch.bat"; #endif }; @@ -141,10 +141,10 @@ TEST_F(ManagerTest, RunEnvPre) { // Test that environment is applied regardless of order #ifndef _WIN32 - std::string testPath = "/tmp/ign-launch-env-test-pre"; + std::string testPath = "/tmp/gz-launch-env-test-pre"; #else std::string testPath = - std::string(getenv("localappdata")) + "\\Temp\\ign-launch-env-test-pre"; + std::string(getenv("localappdata")) + "\\Temp\\gz-launch-env-test-pre"; #endif if (gz::common::isFile(testPath)) @@ -179,10 +179,10 @@ TEST_F(ManagerTest, RunEnvPost) { // Test that environment is applied regardless of order #ifndef _WIN32 - std::string testPath = "/tmp/ign-launch-env-test-post"; + std::string testPath = "/tmp/gz-launch-env-test-post"; #else std::string testPath = - std::string(getenv("localappdata")) + "\\Temp\\ign-launch-env-test-post"; + std::string(getenv("localappdata")) + "\\Temp\\gz-launch-env-test-post"; #endif if (gz::common::isFile(testPath)) diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt index f4288274..2b7ae184 100644 --- a/src/cmd/CMakeLists.txt +++ b/src/cmd/CMakeLists.txt @@ -14,7 +14,7 @@ target_link_libraries(gz PUBLIC gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER} ) -set(launch_executable ign-launch) +set(launch_executable gz-launch) add_executable(${launch_executable} launch_main.cc) target_link_libraries(${launch_executable} gz