From eb1db504ef27c001898b51bf2aa68796cebc77a9 Mon Sep 17 00:00:00 2001
From: Olivier Stasse <ostasse@laas.fr>
Date: Wed, 9 Oct 2019 15:36:29 +0200
Subject: [PATCH] [cmake] Synchronize CMakeLists.txt change to appropriate
 Gazebo version.

---
 CMakeLists.txt | 8 +++++---
 cmake          | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bebae38..010fe5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,14 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
-INCLUDE(cmake/base.cmake)
-#include(cmake/ros.cmake)
+
 
 SET(PROJECT_ORG pyrene-dev)
 SET(PROJECT_NAME talos_data)
 SET(PROJECT_DESCRIPTION "Talos urdf model, srdf model and other data")
 SET(PROJECT_URL "https://gepgitlab.laas.fr/${PROJECT_ORG}/${PROJECT_NAME}")
 
+#include(cmake/ros.cmake)
+INCLUDE(cmake/base.cmake)
+
 set(CXX_DISABLE_WERROR True)
 SETUP_PROJECT()
 
@@ -21,7 +23,7 @@ catkin_package(
 
 # Find xml_reflection
 ADD_REQUIRED_DEPENDENCY("urdfdom >= 0.2.9")
-ADD_REQUIRED_DEPENDENCY("gazebo >= 7.12.0")
+ADD_REQUIRED_DEPENDENCY("gazebo >= 7.0.0")
 ADD_REQUIRED_DEPENDENCY(roscpp)
 
 SET(LIBRARY_NAME ${PROJECT_NAME})
diff --git a/cmake b/cmake
index 9e335a1..192812c 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 9e335a1c690403f6dab12ea6707fd9cfd0f596d2
+Subproject commit 192812cc2c5d8aaffbc8536d0b0a2a7c11dad53b
-- 
GitLab