Bumps in garden : ign-cmake3, ign-util2, ign-plugin2 (#74)

Signed-off-by: Brandon Ong <brandon@openrobotics.org> Co-authored-by: Louise Poubel <louise@openrobotics.org>
gazebosim · Apr 11, 2022 · a52ad70 · a52ad70
1 parent 940e918
commit a52ad70
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 30 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -1,3 +1,3 @@
-libignition-cmake2-dev
+libignition-cmake3-dev
 libignition-tools-dev
-libignition-utils1-cli-dev
+libignition-utils2-cli-dev
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,8 +8,8 @@ project(ignition-plugin2 VERSION 2.0.0)
 #============================================================================
 # Find ignition-cmake
 #============================================================================
-find_package(ignition-cmake2 2.8.0 REQUIRED)
-set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})
+find_package(ignition-cmake3 REQUIRED)
+set(IGN_CMAKE_VER ${ignition-cmake3_VERSION_MAJOR})
 
 #============================================================================
 # Configure the project
@@ -43,8 +43,8 @@ find_program(IGN_TOOLS_PROGRAM ign)
 
 #--------------------------------------
 # Find ignition-utils
-ign_find_package(ignition-utils1 REQUIRED COMPONENTS cli)
-set(IGN_UTILS_VER ${ignition-utils1_VERSION_MAJOR})
+ign_find_package(ignition-utils2 REQUIRED COMPONENTS cli)
+set(IGN_UTILS_VER ${ignition-utils2_VERSION_MAJOR})
 
 
 #============================================================================

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -2,26 +2,14 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)
 
 project(examples)
 
-# Find the ignition-plugin library
 find_package(ignition-plugin2 QUIET REQUIRED COMPONENTS all)
 set(IGN_PLUGIN_VER ${ignition-plugin2_VERSION_MAJOR})
-find_package(ignition-common2 QUIET)
-set(IGN_COMMON_VER ${ignition-common2_VERSION_MAJOR})
-if(NOT ignition-common2_FOUND)
-  find_package(ignition-common3 QUIET)
-  set(IGN_COMMON_VER ${ignition-common3_VERSION_MAJOR})
-endif()
-if(NOT ignition-common2_FOUND AND NOT ignition-common3_FOUND)
-  find_package(ignition-common4 QUIET REQUIRED)
-  set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR})
-endif()
 
-find_package(ignition-math5 QUIET)
-set(IGN_MATH_VER ${ignition-math5_VERSION_MAJOR})
-if(NOT ignition-math5_FOUND)
-  find_package(ignition-math6 QUIET REQUIRED)
-  set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})
-endif()
+find_package(ignition-common5 QUIET)
+set(IGN_COMMON_VER ${ignition-common5_VERSION_MAJOR})
+
+find_package(ignition-math7 QUIET)
+set(IGN_MATH_VER ${ignition-math7_VERSION_MAJOR})
 
 add_subdirectory(plugins)
 

diff --git a/loader/conf/CMakeLists.txt b/loader/conf/CMakeLists.txt
@@ -3,7 +3,7 @@ set(ign_library_path "${CMAKE_BINARY_DIR}/test/lib/$<CONFIG>/ruby/ignition/cmd${
 
 # Generate a configuration file for internal testing.
 # Note that the major version of the library is included in the name.
-# Ex: plugin1.yaml
+# Ex: plugin2.yaml
 configure_file(
   "${IGN_DESIGNATION}.yaml.in"
   "${CMAKE_CURRENT_BINARY_DIR}/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml.configured" @ONLY)
@@ -17,7 +17,7 @@ set(ign_library_path "${CMAKE_INSTALL_PREFIX}/lib/ruby/ignition/cmd${IGN_DESIGNA
 
 # Generate the configuration file that is installed.
 # Note that the major version of the library is included in the name.
-# Ex: plugin1.yaml
+# Ex: plugin2.yaml
 configure_file(
   "${IGN_DESIGNATION}.yaml.in"
   "${CMAKE_CURRENT_BINARY_DIR}/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml" @ONLY)

diff --git a/loader/src/cmd/CMakeLists.txt b/loader/src/cmd/CMakeLists.txt
@@ -24,7 +24,7 @@ install(
 #===============================================================================
 # Generate the ruby script for internal testing.
 # Note that the major version of the library is included in the name.
-# Ex: cmdplugin1.rb
+# Ex: cmdplugin2.rb
 set(cmd_script_generated_test "${CMAKE_BINARY_DIR}/test/lib/$<CONFIG>/ruby/ignition/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb")
 set(cmd_script_configured_test "${CMAKE_CURRENT_BINARY_DIR}/test_cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb.configured")
 
@@ -46,7 +46,7 @@ file(GENERATE
 # Used for the installed version.
 # Generate the ruby script that gets installed.
 # Note that the major version of the library is included in the name.
-# Ex: cmdplugin1.rb
+# Ex: cmdplugin2.rb
 set(cmd_script_generated "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb")
 set(cmd_script_configured "${CMAKE_CURRENT_BINARY_DIR}/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb.configured")
 

diff --git a/tutorials/02_installation.md b/tutorials/02_installation.md
@@ -42,7 +42,7 @@ sudo apt install libignition-plugin-dev
 
 1. Install Ignition dependencies
   ```
-  sudo apt-get install libignition-cmake2-dev libignition-tools-dev libignition-utils1-cli-dev
+  sudo apt-get install libignition-cmake3-dev libignition-tools-dev libignition-utils2-cli-dev
   ```
 
 1. Install Ignition Tools if you want to use the `ign plugin` command line tool:
@@ -88,15 +88,15 @@ Sierra (10.12) or later.
 2. Run the following commands
   ```bash
   brew tap osrf/simulation
-  brew install ignition-plugin1
+  brew install ignition-plugin2
   ```
 
 ## Source Installation
 
 1. Install dependencies
   ```bash
   brew tap osrf/simulation
-  brew install ignition-plugin1 --only-dependencies
+  brew install ignition-plugin2 --only-dependencies
   ```
 
 2. Clone the repository