Merge 462290b into dbd0f97

gazebosim · Jun 20, 2022 · c5ef194 · c5ef194
2 parents dbd0f97 + 462290b
commit c5ef194
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,13 +3,13 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(ignition-plugin2 VERSION 2.0.0)
+project(gz-plugin2 VERSION 2.0.0)
 
 #============================================================================
-# Find ignition-cmake
+# Find gz-cmake
 #============================================================================
-find_package(ignition-cmake3 REQUIRED)
-set(IGN_CMAKE_VER ${ignition-cmake3_VERSION_MAJOR})
+find_package(gz-cmake3 REQUIRED)
+set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})
 
 #============================================================================
 # Configure the project
@@ -44,9 +44,9 @@ find_program(GZ_TOOLS_PROGRAM ign)
 
 
 #--------------------------------------
-# Find ignition-utils
-gz_find_package(ignition-utils2 REQUIRED COMPONENTS cli)
-set(IGN_UTILS_VER ${ignition-utils2_VERSION_MAJOR})
+# Find gz-utils
+gz_find_package(gz-utils2 REQUIRED COMPONENTS cli)
+set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})
 
 
 #============================================================================

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -8,7 +8,7 @@ gz_create_core_library(
   CXX_STANDARD 17)
 
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
-  PUBLIC ignition-utils${IGN_UTILS_VER}::ignition-utils${IGN_UTILS_VER})
+  PUBLIC gz-utils${GZ_UTILS_VER}::gz-utils${GZ_UTILS_VER})
 
 # Build the unit tests
 gz_build_tests(

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -2,14 +2,14 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)
 
 project(examples)
 
-find_package(ignition-plugin2 QUIET REQUIRED COMPONENTS all)
-set(IGN_PLUGIN_VER ${ignition-plugin2_VERSION_MAJOR})
+find_package(gz-plugin2 QUIET REQUIRED COMPONENTS all)
+set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
 
-find_package(ignition-common5 QUIET)
-set(IGN_COMMON_VER ${ignition-common5_VERSION_MAJOR})
+find_package(gz-common5 QUIET)
+set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR})
 
-find_package(ignition-math7 QUIET)
-set(IGN_MATH_VER ${ignition-math7_VERSION_MAJOR})
+find_package(gz-math7 QUIET)
+set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})
 
 add_subdirectory(plugins)
 
@@ -30,9 +30,9 @@ foreach(example_file ${example_files})
 
   target_link_libraries(${example}
     PRIVATE
-      ignition-plugin${IGN_PLUGIN_VER}::loader
-      ignition-common${IGN_COMMON_VER}::core
-      ignition-math${IGN_MATH_VER}::core
+      gz-plugin${GZ_PLUGIN_VER}::loader
+      gz-common${GZ_COMMON_VER}::core
+      gz-math${GZ_MATH_VER}::core
   )
 
   # This is only needed for the examples that use plugins, but it doesn't hurt

diff --git a/examples/plugins/CMakeLists.txt b/examples/plugins/CMakeLists.txt
@@ -13,8 +13,8 @@ foreach(plugin_file ${plugin_files})
 
   target_link_libraries(${plugin}
     PRIVATE
-      ignition-plugin${IGN_PLUGIN_VER}::register
-      ignition-math${IGN_MATH_VER}::core)
+      gz-plugin${GZ_PLUGIN_VER}::register
+      gz-math${GZ_MATH_VER}::core)
 
   # All these libraries will go into the same directory, so it's sufficient for
   # us to grab the last one.

diff --git a/loader/src/cmd/CMakeLists.txt b/loader/src/cmd/CMakeLists.txt
@@ -8,7 +8,7 @@ set(plugin_executable ign-plugin)
 add_executable(${plugin_executable} plugin_main.cc)
 target_link_libraries(${plugin_executable}
   ign
-  ignition-utils${IGN_UTILS_VER}::cli
+  gz-utils${GZ_UTILS_VER}::cli
   ${loader}
 )