From 72535ebf28104dcd31a35a9fe26ce95fa5a7b77e Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 12 Dec 2020 15:59:32 +0100 Subject: [PATCH 1/3] Create 2906.patch --- recipe/2906.patch | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 recipe/2906.patch diff --git a/recipe/2906.patch b/recipe/2906.patch new file mode 100644 index 00000000..5a86ad14 --- /dev/null +++ b/recipe/2906.patch @@ -0,0 +1,36 @@ +From d05c6a0782bf02651a8e1d971fc42601a6adfb15 Mon Sep 17 00:00:00 2001 +From: Silvio Traversaro +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 From 0941a25dc0e5ec390f963327ec4fe7c0cd4439e2 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 12 Dec 2020 16:00:47 +0100 Subject: [PATCH 2/3] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5e895ea2..945ee590 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,6 +13,7 @@ source: - use-external-libs-config.patch - normalize-ogre-path.patch - cmake_129_workaround.patch # [unix] + - 2906.patch build: number: 2 From 65d928d1bef46a4ec547cc4ec4c7779ec35d5019 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 12 Dec 2020 16:03:11 +0100 Subject: [PATCH 3/3] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 945ee590..50318c82 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,7 +16,7 @@ source: - 2906.patch build: - number: 2 + number: 3 skip: false run_exports: - {{ pin_subpackage('gazebo', max_pin='x') }}