From a92bdf9ca50ef5826034e190ba3f31f6e133e0ed Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <silvio.traversaro@iit.it>
Date: Fri, 3 Apr 2020 15:56:14 +0200
Subject: [PATCH] Fix  find_package(iDynTree) when IDYNTREE_USES_ASSIMP is ON
 and BUILD_SHARED_LIBS is  OFF (#667)

* Fix  find_package(iDynTree) when IDYNTREE_USES_ASSIMP is ON and BUILD_SHARED_LIBS is  OFF

If iDynTree builds static libraries, then the `iDynTreeConfig.cmake` should call `find_dependency(assimp REQUIRED)`

* Add workaround for non-relocatable ICUB cmake config files
---
 .github/workflows/ci.yml | 3 ++-
 CHANGELOG.md             | 7 +++++++
 CMakeLists.txt           | 5 ++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 134df2db81f..37cd4780e82 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,7 +82,8 @@ jobs:
       uses: actions/cache@v1
       with:
         path: ${{ github.workspace }}/install/deps
-        key: source-deps-${{ runner.os }}-vcpkg-robotology-${{ env.vcpkg_robotology_TAG }}-ycm-${{ env.YCM_TAG }}-yarp-${{ env.YARP_TAG }}-icub-${{ env.ICUB_TAG }}
+        # Including ${{ runner.temp }} is a workaround for https://github.com/robotology/whole-body-estimators/issues/60
+        key: source-deps-${{ runner.os }}-${{ runner.temp }}-vcpkg-robotology-${{ env.vcpkg_robotology_TAG }}-ycm-${{ env.YCM_TAG }}-yarp-${{ env.YARP_TAG }}-icub-${{ env.ICUB_TAG }}-github-workspace-${{ env.GITHUB_WORKSPACE }}
     
     - name: Source-based Dependencies [Windows] 
       if: steps.cache-source-deps.outputs.cache-hit != 'true' && matrix.os == 'windows-latest-disable-until-issue-569-is-solved'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c21f432ded..57849e38d72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
+## [1.0.5] - 2020-04-03
+
+### Fixed 
+- Fix find_package(iDynTree) when iDynTree is built with IDYNTREE_USES_ASSIMP ON and BUILD_SHARED_LIBS OFF (https://github.com/robotology/idyntree/pull/667). 
+
+
 ## [1.0.4] - 2020-04-02
 
 ### Fixed 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2628cbec57b..5cbe89d22c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ set(VARS_PREFIX "iDynTree")
 
 set(${VARS_PREFIX}_MAJOR_VERSION 1)
 set(${VARS_PREFIX}_MINOR_VERSION 0)
-set(${VARS_PREFIX}_PATCH_VERSION 4)
+set(${VARS_PREFIX}_PATCH_VERSION 5)
 set(${VARS_PREFIX}_VERSION ${${VARS_PREFIX}_MAJOR_VERSION}.${${VARS_PREFIX}_MINOR_VERSION}.${${VARS_PREFIX}_PATCH_VERSION})
 
 # Pick up our CMake scripts - they are all in the cmake subdirectory.
@@ -74,6 +74,9 @@ if(NOT IDYNTREE_ONLY_DOCS)
     if(IDYNTREE_USES_OSQPEIGEN)
         list(APPEND _IDYNTREE_EXPORTED_DEPENDENCIES_ONLY_STATIC OsqpEigen)
     endif()
+    if(IDYNTREE_USES_ASSIMP)
+        list(APPEND _IDYNTREE_EXPORTED_DEPENDENCIES_ONLY_STATIC assimp)
+    endif()
 
     include(InstallBasicPackageFiles)
     install_basic_package_files(iDynTree VARS_PREFIX ${VARS_PREFIX}