Fix deprecation warnings, explicitly depend on utils

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Apr 14, 2022 · 1e79783 · 1e79783
1 parent 0b36d21
commit 1e79783
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 6 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -6,6 +6,7 @@ libignition-common5-dev
 libignition-math7-dev
 libignition-msgs9-dev
 libignition-tools2-dev
+libignition-utils2-dev
 libjsoncpp-dev
 libtinyxml2-dev
 libyaml-dev

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,6 +45,11 @@ ign_find_package(YAML REQUIRED PRIVATE)
 # Find libzip
 ign_find_package(ZIP REQUIRED PRIVATE)
 
+#--------------------------------------
+# Find ignition-utils
+ign_find_package(ignition-utils2 REQUIRED)
+set(IGN_UTILS_VER ${ignition-utils2_VERSION_MAJOR})
+
 #--------------------------------------
 # Find ignition-common
 ign_find_package(ignition-common5 REQUIRED PRIVATE)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -68,7 +68,6 @@ ign_target_interface_include_directories(${PROJECT_LIBRARY_TARGET_NAME}
 ign_build_tests(TYPE UNIT
                 SOURCES ${gtest_sources}
                 LIB_DEPS
-                  ignition-cmake${IGN_CMAKE_VER}::utilities
                   ignition-common${IGN_COMMON_MAJOR_VER}::ignition-common${IGN_COMMON_MAJOR_VER}
                   TINYXML2::TINYXML2
 )

diff --git a/src/FuelClient_TEST.cc b/src/FuelClient_TEST.cc
@@ -19,7 +19,7 @@
 #include <fstream>
 #include <ignition/common/Console.hh>
 #include <ignition/common/Filesystem.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "ignition/fuel_tools/FuelClient.hh"
 #include "ignition/fuel_tools/ClientConfig.hh"

diff --git a/src/Interface_TEST.cc b/src/Interface_TEST.cc
@@ -18,7 +18,7 @@
 #include <gtest/gtest.h>
 #include <ignition/common/Console.hh>
 #include <ignition/common/Filesystem.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 #include "ignition/fuel_tools/ClientConfig.hh"
 #include "ignition/fuel_tools/FuelClient.hh"
 #include "ignition/fuel_tools/Interface.hh"

diff --git a/src/LocalCache_TEST.cc b/src/LocalCache_TEST.cc
@@ -22,7 +22,7 @@
 #include <string>
 #include <ignition/common/Console.hh>
 #include <ignition/common/Filesystem.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "ignition/fuel_tools/ClientConfig.hh"
 #include "ignition/fuel_tools/WorldIdentifier.hh"

diff --git a/src/ign_TEST.cc b/src/ign_TEST.cc
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 
 #include <string>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "ignition/fuel_tools/config.hh"
 #include "test_config.h"

diff --git a/src/ign_src_TEST.cc b/src/ign_src_TEST.cc
@@ -21,7 +21,7 @@
 
 #include <string>
 #include <ignition/common/Filesystem.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "ign.hh"
 #include "test_config.h"