From a1065a1474281a8358d16b43ec16a322e1322264 Mon Sep 17 00:00:00 2001
From: methylDragon <methylDragon@gmail.com>
Date: Sun, 10 Jul 2022 22:02:38 -0700
Subject: [PATCH] Potentially breaking: Migrate ignition include directory

Signed-off-by: methylDragon <methylDragon@gmail.com>
---
 cmake/GzConfigureProject.cmake | 4 ++--
 cmake/GzPackaging.cmake        | 4 ++--
 codecheck/cpplint.py           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmake/GzConfigureProject.cmake b/cmake/GzConfigureProject.cmake
index 67bd82d2..479510e5 100644
--- a/cmake/GzConfigureProject.cmake
+++ b/cmake/GzConfigureProject.cmake
@@ -10,7 +10,7 @@
 #     cmake project name.
 # REPLACE_GZ_INCLUDE_PATH: Optional. Specify include folder
 #     names to replace the default value of
-#     ignition/${GZ_DESIGNATION}
+#     gz/${GZ_DESIGNATION}
 # VERSION_SUFFIX: Optional. Specify a prerelease version suffix.
 #
 #===============================================================================
@@ -122,7 +122,7 @@ macro(gz_configure_project)
     message(DEPRECATION "[REPLACE_IGNITION_INCLUDE_PATH] is deprecated. Please use [REPLACE_GZ_INCLUDE_PATH] instead!")
     set(PROJECT_INCLUDE_DIR ${gz_configure_project_REPLACE_IGNITION_INCLUDE_PATH})
   else()
-    set(PROJECT_INCLUDE_DIR ignition/${GZ_DESIGNATION})
+    set(PROJECT_INCLUDE_DIR gz/${GZ_DESIGNATION})
   endif()
 
   # version <major>.<minor>
diff --git a/cmake/GzPackaging.cmake b/cmake/GzPackaging.cmake
index fe7b16ea..a67ac7e2 100644
--- a/cmake/GzPackaging.cmake
+++ b/cmake/GzPackaging.cmake
@@ -104,9 +104,9 @@ macro(_gz_setup_packages)
   #============================================================================
   # Set up installation directories
   set(GZ_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
-  set(GZ_INCLUDE_INSTALL_DIR_POSTFIX "ignition/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}")
+  set(GZ_INCLUDE_INSTALL_DIR_POSTFIX "gz/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}")
   set(GZ_INCLUDE_INSTALL_DIR_FULL    "${GZ_INCLUDE_INSTALL_DIR}/${GZ_INCLUDE_INSTALL_DIR_POSTFIX}")
-  set(GZ_DATA_INSTALL_DIR_POSTFIX "ignition/${PROJECT_NAME_LOWER}")
+  set(GZ_DATA_INSTALL_DIR_POSTFIX "gz/${PROJECT_NAME_LOWER}")
   set(GZ_DATA_INSTALL_DIR         "${CMAKE_INSTALL_DATAROOTDIR}/${GZ_DATA_INSTALL_DIR_POSTFIX}")
   set(GZ_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
   set(GZ_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR})
diff --git a/codecheck/cpplint.py b/codecheck/cpplint.py
index 1632bed1..a080437d 100644
--- a/codecheck/cpplint.py
+++ b/codecheck/cpplint.py
@@ -6669,7 +6669,7 @@ def ProcessFile(filename, vlevel, extra_check_functions=None):
   # should rely on the extension.
   if filename != '-' and file_extension not in GetAllExtensions():
     pass
-    # Ignition: never print this
+    # Gazebo: never print this
     # _cpplint_state.PrintError('Ignoring %s; not a valid file name '
     #                 '(%s)\n' % (filename, ', '.join(GetAllExtensions())))
   else:
@@ -6698,7 +6698,7 @@ def ProcessFile(filename, vlevel, extra_check_functions=None):
   # count has increased after processing this file.
   if not _cpplint_state.quiet or old_errors != _cpplint_state.error_count:
     pass
-    # Ignition: never print "Done Processing"
+    # Gazebo: never print "Done Processing"
     # _cpplint_state.PrintInfo('Done processing %s\n' % filename)
   _RestoreFilters()