From 3cfa0595cc4a71137cf6895294e6875efa811f18 Mon Sep 17 00:00:00 2001
From: Louise Poubel <louise@openrobotics.org>
Date: Mon, 9 May 2022 18:04:24 -0700
Subject: [PATCH 1/2] Rename CMake project to gz

Signed-off-by: Louise Poubel <louise@openrobotics.org>
---
 BUILD.bazel        |  2 +-
 CMakeLists.txt     | 16 ++++++++--------
 src/CMakeLists.txt |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index 59babb77..dbd52468 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -26,7 +26,7 @@ licenses(["notice"])
 
 exports_files(["LICENSE"])
 
-PROJECT_NAME = "ignition-msgs"
+PROJECT_NAME = "gz-msgs"
 
 PROJECT_MAJOR = 8
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae15e1de..6fbcb070 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,13 +3,13 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(ignition-msgs9 VERSION 9.0.0)
+project(gz-msgs9 VERSION 9.0.0)
 
 #============================================================================
-# Find ignition-cmake
+# Find gz-cmake
 #============================================================================
-# If you get an error at this line, you need to install ignition-cmake
-find_package(ignition-cmake3 REQUIRED)
+# If you get an error at this line, you need to install gz-cmake
+find_package(gz-cmake3 REQUIRED)
 
 #============================================================================
 # Configure the project
@@ -83,9 +83,9 @@ gz_find_package(IgnProtobuf
                  PRETTY Protobuf)
 
 #--------------------------------------
-# Find ignition-math
-gz_find_package(ignition-math7 REQUIRED)
-set(IGN_MATH_VER ${ignition-math7_VERSION_MAJOR})
+# Find gz-math
+gz_find_package(gz-math7 REQUIRED)
+set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})
 
 #--------------------------------------
 # Find if ign command is available
@@ -142,5 +142,5 @@ gz_create_docs(
 # Wait to build the doc for the autogenerated code
 # The TARGET will exist if doxygen is installed
 if(TARGET doc)
-  add_dependencies(doc ignition-msgs${PROJECT_VERSION_MAJOR})
+  add_dependencies(doc gz-msgs${PROJECT_VERSION_MAJOR})
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b6626885..c4cead74 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -188,7 +188,7 @@ target_include_directories(${PROJECT_LIBRARY_TARGET_NAME}
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
     protobuf::libprotobuf
-    ignition-math${IGN_MATH_VER}::ignition-math${IGN_MATH_VER}
+    gz-math${GZ_MATH_VER}::gz-math${GZ_MATH_VER}
   PRIVATE
     TINYXML2::TINYXML2
 )

From d0209c44a8ff29154b2ce7ff14bf3c5c5608b56a Mon Sep 17 00:00:00 2001
From: Louise Poubel <louise@openrobotics.org>
Date: Thu, 16 Jun 2022 11:12:08 -0700
Subject: [PATCH 2/2] Bazel

Signed-off-by: Louise Poubel <louise@openrobotics.org>
---
 BUILD.bazel      | 14 +++++++-------
 test/BUILD.bazel |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index dbd52468..7d4622db 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,12 +1,12 @@
 load(
-    "//ign_bazel:build_defs.bzl",
+    "//gz_bazel:build_defs.bzl",
     "IGNITION_ROOT",
     "IGNITION_VISIBILITY",
     "cmake_configure_file",
     "generate_include_header",
     "generate_yaml",
-    "ign_config_header",
-    "ign_export_header",
+    "gz_config_header",
+    "gz_export_header",
 )
 load(
     ":gz_msg_gen.bzl",
@@ -35,7 +35,7 @@ PROJECT_MINOR = 0
 PROJECT_PATCH = 0
 
 # Generates config.hh based on the version numbers in CMake code.
-ign_config_header(
+gz_config_header(
     name = "config",
     src = "include/gz/msgs/config.hh.in",
     cmakelists = ["CMakeLists.txt"],
@@ -43,7 +43,7 @@ ign_config_header(
     project_version = (PROJECT_MAJOR, PROJECT_MINOR, PROJECT_PATCH),
 )
 
-ign_export_header(
+gz_export_header(
     name = "include/gz/msgs/Export.hh",
     export_base = "IGNITION_MSGS",
     lib_name = "ignition-msgs",
@@ -127,7 +127,7 @@ cc_library(
     includes = ["include"],
     deps = [
         ":gzmsgs_proto_cc",
-        IGNITION_ROOT + "ign_math",
+        IGNITION_ROOT + "gz_math",
         "@com_google_protobuf//:protobuf",
         "@tinyxml2",
     ],
@@ -154,7 +154,7 @@ cc_binary(
     data = [IGNITION_ROOT + "gz_msgs/test:desc/stringmsg.desc"],
     deps = [
         ":gz_msgs",
-        IGNITION_ROOT + "ign_math",
+        IGNITION_ROOT + "gz_math",
         IGNITION_ROOT + "gz_msgs/test:test_utils",
         "@gtest",
         "@gtest//:gtest_main",
diff --git a/test/BUILD.bazel b/test/BUILD.bazel
index ad19646a..ad4f3b53 100644
--- a/test/BUILD.bazel
+++ b/test/BUILD.bazel
@@ -1,5 +1,5 @@
 load(
-    "//ign_bazel:build_defs.bzl",
+    "//gz_bazel:build_defs.bzl",
     "IGNITION_ROOT",
     "IGNITION_VISIBILITY",
     "cmake_configure_file",