Bumps in garden: depend on ign-math7 and ign-common5 (#343)

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Dec 29, 2021 · ebbb88a · ebbb88a
1 parent 71e3f6c
commit ebbb88a
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 17 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -1,6 +1,6 @@
 libignition-cmake2-dev
-libignition-common4-dev
-libignition-math6-dev
+libignition-common5-dev
+libignition-math7-dev
 libignition-msgs9-dev
 libignition-plugin-dev
 libignition-rendering7-dev

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,13 +39,13 @@ ign_find_package(TINYXML2 REQUIRED PRIVATE PRETTY tinyxml2)
 
 #--------------------------------------
 # Find ignition-math
-ign_find_package(ignition-math6 REQUIRED VERSION 6.5)
-set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})
+ign_find_package(ignition-math7 REQUIRED)
+set(IGN_MATH_VER ${ignition-math7_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-common
-ign_find_package(ignition-common4 REQUIRED COMPONENTS profiler VERSION 4.1)
-set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR})
+ign_find_package(ignition-common5 REQUIRED COMPONENTS profiler)
+set(IGN_COMMON_VER ${ignition-common5_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-plugin

diff --git a/examples/plugin/custom_context_menu/CMakeLists.txt b/examples/plugin/custom_context_menu/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package (Qt5
 
 # Find the Ignition gui library
 find_package(ignition-gui7 REQUIRED)
-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common5 REQUIRED)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IGNITION-GUI_CXX_FLAGS}")
 

diff --git a/examples/plugin/dialog_from_plugin/CMakeLists.txt b/examples/plugin/dialog_from_plugin/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package (Qt5
 
 # Find the Ignition gui library
 find_package(ignition-gui7 REQUIRED)
-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common5 REQUIRED)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IGNITION-GUI_CXX_FLAGS}")
 

diff --git a/examples/plugin/hello_plugin/CMakeLists.txt b/examples/plugin/hello_plugin/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package (Qt5
 
 # Find the Ignition gui library
 find_package(ignition-gui7 REQUIRED)
-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common5 REQUIRED)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IGNITION-GUI_CXX_FLAGS}")
 

diff --git a/examples/plugin/ign_components/CMakeLists.txt b/examples/plugin/ign_components/CMakeLists.txt
@@ -15,7 +15,7 @@ find_package (Qt5
 )
 
 find_package(ignition-gui7 REQUIRED)
-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common5 REQUIRED)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IGNITION-GUI_CXX_FLAGS}")
 

diff --git a/examples/plugin/multiple_qml/CMakeLists.txt b/examples/plugin/multiple_qml/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package (Qt5
 
 # Find the Ignition gui library
 find_package(ignition-gui7 REQUIRED)
-find_package(ignition-common4 REQUIRED)
+find_package(ignition-common5 REQUIRED)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IGNITION-GUI_CXX_FLAGS}")
 

diff --git a/examples/standalone/marker/CMakeLists.txt b/examples/standalone/marker/CMakeLists.txt
@@ -4,8 +4,8 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
   find_package(ignition-transport12 QUIET REQUIRED OPTIONAL_COMPONENTS log)
   set(IGN_TRANSPORT_VER ${ignition-transport12_VERSION_MAJOR})
 
-  find_package(ignition-common4 REQUIRED)
-  set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR})
+  find_package(ignition-common5 REQUIRED)
+  set(IGN_COMMON_VER ${ignition-common5_VERSION_MAJOR})
 
   find_package(ignition-msgs9 REQUIRED)
   set(IGN_MSGS_VER ${ignition-msgs9_VERSION_MAJOR})

diff --git a/include/ignition/gui/Conversions.hh b/include/ignition/gui/Conversions.hh
@@ -27,7 +27,6 @@
 #endif
 #include <ignition/common/KeyEvent.hh>
 #include <ignition/common/MouseEvent.hh>
-#include <ignition/common/Time.hh>
 #include <ignition/math/Color.hh>
 #include <ignition/math/Vector2.hh>
 #include <ignition/math/Vector3.hh>

diff --git a/src/plugins/scene3d/Scene3D.cc b/src/plugins/scene3d/Scene3D.cc
@@ -727,7 +727,7 @@ rendering::GeometryPtr SceneManager::LoadGeometry(const msgs::Geometry &_msg,
       // The rotation is the angle between the +z(0,0,1) vector and the
       // normal, which are both expressed in the local (Visual) frame.
       math::Vector3d normal = msgs::Convert(_msg.plane().normal());
-      localPose.Rot().From2Axes(math::Vector3d::UnitZ, normal.Normalized());
+      localPose.Rot().SetFrom2Axes(math::Vector3d::UnitZ, normal.Normalized());
     }
   }
   else if (_msg.has_sphere())

diff --git a/src/plugins/transport_scene_manager/TransportSceneManager.cc b/src/plugins/transport_scene_manager/TransportSceneManager.cc
@@ -694,7 +694,7 @@ rendering::GeometryPtr TransportSceneManagerPrivate::LoadGeometry(
       // The rotation is the angle between the +z(0,0,1) vector and the
       // normal, which are both expressed in the local (Visual) frame.
       math::Vector3d normal = msgs::Convert(_msg.plane().normal());
-      localPose.Rot().From2Axes(math::Vector3d::UnitZ, normal.Normalized());
+      localPose.Rot().SetFrom2Axes(math::Vector3d::UnitZ, normal.Normalized());
     }
   }
   else if (_msg.has_sphere())

diff --git a/src/plugins/world_control/WorldControl.cc b/src/plugins/world_control/WorldControl.cc
@@ -20,7 +20,6 @@
 #include <string>
 
 #include <ignition/common/Console.hh>
-#include <ignition/common/Time.hh>
 #include <ignition/common/StringUtils.hh>
 #include <ignition/plugin/Register.hh>