Migrate IGNITION- CMake variables

Signed-off-by: methylDragon <methylDragon@gmail.com>
gazebosim · Jun 25, 2022 · 1b1d479 · 1b1d479
1 parent 30fc00b
commit 1b1d479
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/example/configure.bat b/example/configure.bat
@@ -9,15 +9,15 @@
 
 @set PROTOBUF_PATH=%cd%\..\..\..\protobuf-2.6.0-win%build_bitness%-vc12
 @set IGN_TRANSPORT_PATH=%cd%\..\..\build\install\%build_type%
-@set IGNITION-MSGS_PATH=%cd%\..\..\..\ign-msgs\build\install\%build_type%
-@set IGNITION-MSGS_CMAKE_PREFIX_PATH=%IGNITION-MSGS_PATH%\CMake
-@set IGNITION-MATH_PATH=%cd%\..\..\..\ign-math\build\install\%build_type%
-@set IGNITION-MATH_CMAKE_PREFIX_PATH=%IGNITION-MATH_PATH%\CMake
+@set GZ-MSGS_PATH=%cd%\..\..\..\ign-msgs\build\install\%build_type%
+@set GZ-MSGS_CMAKE_PREFIX_PATH=%GZ-MSGS_PATH%\CMake
+@set GZ-MATH_PATH=%cd%\..\..\..\ign-math\build\install\%build_type%
+@set GZ-MATH_CMAKE_PREFIX_PATH=%GZ-MATH_PATH%\CMake
 
 cmake -G "NMake Makefiles"^
-      -DCMAKE_PREFIX_PATH="%IGN_TRANSPORT_PATH%\lib\cmake\ignition-transport12;%IGNITION-MSGS_CMAKE_PREFIX_PATH%;%IGNITION-MATH_CMAKE_PREFIX_PATH%;"^
+      -DCMAKE_PREFIX_PATH="%IGN_TRANSPORT_PATH%\lib\cmake\ignition-transport12;%GZ-MSGS_CMAKE_PREFIX_PATH%;%GZ-MATH_CMAKE_PREFIX_PATH%;"^
       -DPROTOBUF_SRC_ROOT_FOLDER="%PROTOBUF_PATH%"^
-      -DIGNITION-MSGS_FOLDER="%IGNITION-MSGS_PATH%"^
+      -DGZ-MSGS_FOLDER="%GZ-MSGS_PATH%"^
       -DCMAKE_INSTALL_PREFIX="install"^
       -DCMAKE_BUILD_TYPE=%build_type%^
       ..

diff --git a/log/test/integration/CMakeLists.txt b/log/test/integration/CMakeLists.txt
@@ -65,7 +65,7 @@ foreach(source_file ${aux})
 endforeach()
 
 # gz log CLI test
-if (IGNITION-TOOLS_BINARY_DIRS)
+if (GZ-TOOLS_BINARY_DIRS)
   set(GZ_CONFIG_PATH "${CMAKE_BINARY_DIR}/log/test/lib/ruby/gz")
 
   add_test(gz_log_record_no_overwrite

diff --git a/test/test_config.h.in b/test/test_config.h.in
@@ -18,7 +18,7 @@
 #ifndef GZ_TRANSPORT_TEST_CONFIG_HH_
 #define GZ_TRANSPORT_TEST_CONFIG_HH_
 
-#define GZ_PATH "@IGNITION-TOOLS2_BINARY_DIRS@"
+#define GZ_PATH "@GZ-TOOLS2_BINARY_DIRS@"
 #define GZ_CONFIG_PATH "@CMAKE_BINARY_DIR@/test/conf"
 #define GZ_VERSION_FULL "@PROJECT_VERSION_FULL@"
 

diff --git a/tutorials/04_messages.md b/tutorials/04_messages.md
@@ -496,7 +496,7 @@ there is a new subdirectory to inspect containing our custom messages.
 if (EXISTS "${CMAKE_SOURCE_DIR}/publisher_custom_msg.cc")
   add_executable(publisher_custom_msg publisher_custom_msg.cc)
   target_link_libraries(publisher_custom_msg
-     ${IGNITION-TRANSPORT_LIBRARIES}
+     ${GZ-TRANSPORT_LIBRARIES}
      ${PROTO_SRC}
   )
   add_dependencies(publisher_custom_msg protobuf_compilation)
@@ -505,7 +505,7 @@ endif()
 if (EXISTS "${CMAKE_SOURCE_DIR}/subscriber_custom_msg.cc")
   add_executable(subscriber_custom_msg subscriber_custom_msg.cc)
   target_link_libraries(subscriber_custom_msg
-    ${IGNITION-TRANSPORT_LIBRARIES}
+    ${GZ-TRANSPORT_LIBRARIES}
     ${PROTO_SRC}
   )
   add_dependencies(subscriber_custom_msg protobuf_compilation)