Depend on ignition-utils1 cli component (#55)

* Use SuppressWarning.hh from ignition-utils Use the headers from ignition/utils instead of ignition/utilities. This also exports the dependency on ignition-utils1::ignition-utils1 instead of ignition-cmake2::utilities. * rm configure.bat * Add libignition-tools-dev to tutorial Signed-off-by: Steve Peters <[email protected]>
gazebosim · Aug 9, 2021 · 91c3e64 · 91c3e64
1 parent 87b2b3b
commit 91c3e64
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 32 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -1,2 +1,3 @@
 libignition-cmake2-dev
 libignition-tools-dev
+libignition-utils1-cli-dev
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -43,6 +43,12 @@ ign_find_package(DL
 ign_find_package(ignition-tools QUIET)
 
 
+#--------------------------------------
+# Find ignition-utils
+ign_find_package(ignition-utils1 REQUIRED COMPONENTS cli)
+set(IGN_UTILS_VER ${ignition-utils1_VERSION_MAJOR})
+
+
 #============================================================================
 # Configure the build
 #============================================================================

diff --git a/configure.bat b/configure.bat
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -9,7 +9,7 @@ ign_create_core_library(
   CXX_STANDARD 17)
 
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
-  PUBLIC ignition-cmake${IGN_CMAKE_VER}::utilities)
+  PUBLIC ignition-utils${IGN_UTILS_VER}::ignition-utils${IGN_UTILS_VER})
 
 # Build the unit tests
 ign_build_tests(

diff --git a/core/include/ignition/plugin/Info.hh b/core/include/ignition/plugin/Info.hh
@@ -25,7 +25,7 @@
 #include <string>
 #include <unordered_map>
 
-#include <ignition/utilities/SuppressWarning.hh>
+#include <ignition/utils/SuppressWarning.hh>
 
 #include <ignition/plugin/Export.hh>
 

diff --git a/core/include/ignition/plugin/Plugin.hh b/core/include/ignition/plugin/Plugin.hh
@@ -23,7 +23,7 @@
 #include <map>
 #include <string>
 
-#include <ignition/utilities/SuppressWarning.hh>
+#include <ignition/utils/SuppressWarning.hh>
 
 #include <ignition/plugin/Export.hh>
 #include <ignition/plugin/Info.hh>

diff --git a/core/include/ignition/plugin/detail/Factory.hh b/core/include/ignition/plugin/detail/Factory.hh
@@ -21,7 +21,7 @@
 #include <memory>
 #include <utility>
 
-#include <ignition/utilities/SuppressWarning.hh>
+#include <ignition/utils/SuppressWarning.hh>
 
 #include <ignition/plugin/Factory.hh>
 

diff --git a/loader/include/ignition/plugin/Loader.hh b/loader/include/ignition/plugin/Loader.hh
@@ -25,7 +25,7 @@
 #include <typeinfo>
 #include <unordered_set>
 
-#include <ignition/utilities/SuppressWarning.hh>
+#include <ignition/utils/SuppressWarning.hh>
 
 #include <ignition/plugin/loader/Export.hh>
 #include <ignition/plugin/PluginPtr.hh>

diff --git a/register/include/ignition/plugin/detail/Register.hh b/register/include/ignition/plugin/detail/Register.hh
@@ -25,7 +25,7 @@
 #include <type_traits>
 #include <utility>
 
-#include <ignition/utilities/SuppressWarning.hh>
+#include <ignition/utils/SuppressWarning.hh>
 
 #include <ignition/plugin/EnablePluginFromThis.hh>
 #include <ignition/plugin/Info.hh>

diff --git a/tutorials/02_installation.md b/tutorials/02_installation.md
@@ -43,7 +43,7 @@ sudo apt install libignition-plugin-dev
 
 1. Install Ignition dependencies
   ```
-  sudo apt-get install libignition-cmake2-dev
+  sudo apt-get install libignition-cmake2-dev libignition-tools-dev libignition-utils1-cli-dev
   ```
 
 2. Clone the repository