Merge branch 'master' into unittest

c7a5bae7 · Guilhem Saurel · 1c43916e · 7d4faca4 · c7a5bae7 · c7a5bae7
Commit c7a5bae7 authored Feb 26, 2019 by Guilhem Saurel
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 0 deletions

.gitmodules .gitmodules +3 -0

CMakeLists.txt CMakeLists.txt +15 -0

cmake cmake +1 -0

No files found.
--- a/.gitmodules
+++ b/.gitmodules
+[submodule "cmake"]
+	path = cmake
+	url = https://github.com/jrl-umi3218/jrl-cmakemodules.git
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+INCLUDE(cmake/base.cmake)
+
+SET(PROJECT_NAME example-robot-data)
+SET(PROJECT_DESCRIPTION "Set of robot URDFs for benchmarking and developed examples.")
+
+SET(PROJECT_URL https://gepgitlab.laas.fr/gepetto/${PROJECT_NAME})
+
+SETUP_PROJECT()
+
+INSTALL(DIRECTORY hyq DESTINATION share/${PROJECT_NAME})
+INSTALL(DIRECTORY talos DESTINATION share/${PROJECT_NAME})
+
+SETUP_PROJECT_FINALIZE()
--- a/cmake @ cfc25686
+++ b/cmake @ cfc25686
+Subproject commit cfc25686d5e13c40cd8c47946c5d694b4b085670