Merge pull request #43 from traversaro/patch-3

Backport upstream PR 2609 and fix find_package(gazebo) on Windows

recipe/2906.patch

@@ -0,0 +1,36 @@
+From d05c6a0782bf02651a8e1d971fc42601a6adfb15 Mon Sep 17 00:00:00 2001
+From: Silvio Traversaro <silvio@traversaro.it>
+Date: Sat, 12 Dec 2020 15:57:49 +0100
+Subject: [PATCH] Fix find_package(gazebo) on Windows
+
+Fix https://github.com/osrf/gazebo/issues/2905
+---
+ CMakeLists.txt | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 84489b6f9f..277aac87e1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -434,8 +434,19 @@ else (build_errors)
+   # Order is important, if A depends on B, please add B after A.
+   # The list should have at the very end the libraries
+   # without internal interdependencies
+-  set(PKG_LIBRARIES
+-    gazebo
++  
++  # The gazebo library on Windows is called libgazebo to avoid 
++  # conflicts with the gazebo executable
++  if(NOT WIN32)
++    set(PKG_LIBRARIES
++      gazebo
++    )
++  else()
++    set(PKG_LIBRARIES
++      libgazebo
++    )
++  endif()  
++  set(PKG_LIBRARIES ${PKG_LIBRARIES}
+     gazebo_client
+     gazebo_gui
+     gazebo_sensors

recipe/meta.yaml

@@ -13,9 +13,10 @@ source:
       - use-external-libs-config.patch
       - normalize-ogre-path.patch
       - cmake_129_workaround.patch  # [unix]
+      - 2906.patch
 
 build:
-  number: 2
+  number: 3
   skip: false
   run_exports:
     - {{ pin_subpackage('gazebo', max_pin='x') }}