revert ignition prefix

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Jun 20, 2022 · 9efff55 · 9efff55
1 parent 8e7bba6
commit 9efff55
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/cmake/IgnConfigureProject.cmake b/cmake/IgnConfigureProject.cmake
@@ -71,8 +71,14 @@ macro(gz_configure_project)
   # Extract the designation
   #============================================================================
   set(IGN_DESIGNATION ${PROJECT_NAME})
-  # Remove the leading project prefix (assume "gz-")
-  string(REGEX REPLACE "gz-" "" IGN_DESIGNATION ${IGN_DESIGNATION})
+  # Remove the leading project prefix ("gz-" by default)
+  set(PROJECT_PREFIX "gz")
+  # Also support "ignition-"
+  # TODO: remove this `if` block once all package names start with gz
+  if(${IGN_DESIGNATION} MATCHES "^ignition-")
+    set(PROJECT_PREFIX "ignition")
+  endif()
+  string(REGEX REPLACE "${PROJECT_PREFIX}-" "" IGN_DESIGNATION ${IGN_DESIGNATION})
 
   # Remove the trailing version number
   string(REGEX REPLACE "[0-9]+" "" IGN_DESIGNATION ${IGN_DESIGNATION})