Potentially breaking: Migrate ignition include directory

Signed-off-by: methylDragon <[email protected]>
gazebosim · Jul 11, 2022 · e1c4a35 · e1c4a35
1 parent 0754e93
commit e1c4a35
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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})