Release v1.2.1

* Correctly propagate RBDyn::Parsers dependencies
jrl-umi3218 · Apr 29, 2020 · 1b73e9c · 1b73e9c
1 parent ee14d02
commit 1b73e9c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -52,7 +52,7 @@ jobs:
           apt: cython cython3 python-nose python3-nose python-numpy python3-numpy python-coverage python3-coverage python-setuptools python3-setuptools libeigen3-dev doxygen doxygen-latex libboost-all-dev libtinyxml2-dev libyaml-cpp-dev
         macos: |
           cask: gfortran
-          brew: eigen boost tinyxml2  yaml-cpp
+          brew: eigen boost tinyxml2 yaml-cpp
           pip: Cython coverage nose numpy
         windows: |
           pip: Cython coverage nose numpy

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(PROJECT_NAME RBDyn)
 set(PROJECT_DESCRIPTION "...")
 set(PROJECT_URL "https://github.com/jrl-umi3218/RBDyn")
 set(PROJECT_DEBUG_POSTFIX "_d")
-set(PROJECT_VERSION 1.2.0)
+set(PROJECT_VERSION 1.2.1)
 set(PROJECT_USE_CMAKE_EXPORT TRUE)
 
 option(BUILD_RBDYN_PARSERS "Build URDF and YAML parsers" ON)

diff --git a/cmake b/cmake
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+rbdyn (1.2.1-1ubuntu1) unstable; urgency=medium
+
+  * Update upstream version
+
+ -- Pierre Gergondet <[email protected]>  Wed, 29 Apr 2020 11:31:46 +0800
+
 rbdyn (1.2.0-1ubuntu1) unstable; urgency=medium
 
   * Update upstream version

diff --git a/src/parsers/CMakeLists.txt b/src/parsers/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT ${tinyxml2_FOUND})
   find_package(RBDyn_TinyXML2 REQUIRED)
   install(FILES "${PROJECT_SOURCE_DIR}/CMakeModules/FindRBDyn_TinyXML2.cmake"
           DESTINATION "${CONFIG_INSTALL_DIR}")
-  set(PACKAGE_EXTRA_MACROS "include(\${CMAKE_CURRENT_LIST_DIR}/FindRBDyn_TinyXML2.cmake)")
+  set(PACKAGE_EXTRA_MACROS "include(\${CMAKE_CURRENT_LIST_DIR}/FindRBDyn_TinyXML2.cmake)" CACHE INTERNAL "")
 else()
   add_project_dependency(tinyxml2 REQUIRED)
 endif()