From 2b5a1b9d2660d85a82a9de4da4b892bac0403ffc Mon Sep 17 00:00:00 2001 From: Brandon Ong Date: Wed, 6 Apr 2022 15:55:03 -0700 Subject: [PATCH 1/5] Bumps in garden : ign-utils2 Signed-off-by: Brandon Ong --- .github/ci/packages.apt | 2 +- CMakeLists.txt | 2 +- examples/using_cli/CMakeLists.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index ee689d7..d297181 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1 +1 @@ -libignition-cmake2-dev +libignition-cmake3-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index c869cf2..22f6ced 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ project(ignition-utils2 VERSION 2.0.0) # Find ignition-cmake #============================================================================ # If you get an error at this line, you need to install ignition-cmake -find_package(ignition-cmake2 2.0.0 REQUIRED) +find_package(ignition-cmake3 2.0.0 REQUIRED) #============================================================================ # Configure the project diff --git a/examples/using_cli/CMakeLists.txt b/examples/using_cli/CMakeLists.txt index 2e34e93..26964bc 100644 --- a/examples/using_cli/CMakeLists.txt +++ b/examples/using_cli/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) project(ignition-utils-cli-demo) # Find the Ignition Libraries used directly by the example -find_package(ignition-utils1 REQUIRED COMPONENTS cli) -set(IGN_UTILS_VER ${ignition-utils1_VERSION_MAJOR}) +find_package(ignition-utils2 REQUIRED COMPONENTS cli) +set(IGN_UTILS_VER ${ignition-utils2_VERSION_MAJOR}) add_executable(${PROJECT_NAME} main.cc) target_link_libraries( From a0d56f46fff2cda3e27277a04f72d9c3f79d3ddf Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Wed, 6 Apr 2022 17:08:13 -0700 Subject: [PATCH 2/5] 3.0.0 Signed-off-by: Louise Poubel --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 22f6ced..68f272e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ project(ignition-utils2 VERSION 2.0.0) # Find ignition-cmake #============================================================================ # If you get an error at this line, you need to install ignition-cmake -find_package(ignition-cmake3 2.0.0 REQUIRED) +find_package(ignition-cmake3 3.0.0 REQUIRED) #============================================================================ # Configure the project From 84eae0bfe2a1c408080ebea06f285434c674721d Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 7 Apr 2022 16:17:44 -0700 Subject: [PATCH 3/5] Remove ignition-cmake3 version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 68f272e..2c1a6b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ project(ignition-utils2 VERSION 2.0.0) # Find ignition-cmake #============================================================================ # If you get an error at this line, you need to install ignition-cmake -find_package(ignition-cmake3 3.0.0 REQUIRED) +find_package(ignition-cmake3 REQUIRED) #============================================================================ # Configure the project From 51f1a1db8e8eafaf3d648204483e2ad38f517ba3 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 7 Apr 2022 16:20:21 -0700 Subject: [PATCH 4/5] Revert ignition-cmake3 version change --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c1a6b0..68f272e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ project(ignition-utils2 VERSION 2.0.0) # Find ignition-cmake #============================================================================ # If you get an error at this line, you need to install ignition-cmake -find_package(ignition-cmake3 REQUIRED) +find_package(ignition-cmake3 3.0.0 REQUIRED) #============================================================================ # Configure the project From 24cc078667a3692bc6adefdd19952713460e563f Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 7 Apr 2022 17:12:55 -0700 Subject: [PATCH 5/5] Remove version for ignition-cmake3 again --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 68f272e..2c1a6b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ project(ignition-utils2 VERSION 2.0.0) # Find ignition-cmake #============================================================================ # If you get an error at this line, you need to install ignition-cmake -find_package(ignition-cmake3 3.0.0 REQUIRED) +find_package(ignition-cmake3 REQUIRED) #============================================================================ # Configure the project