fixup

robotology · Jan 26, 2020 · 142826b · 142826b
1 parent 97d5d89
commit 142826b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,7 +56,7 @@ if(NOT IDYNTREE_ONLY_DOCS)
     # add the actual components of the library
     add_subdirectory(src)
 
-    # List exported dependencies
+    # List exported CMake package dependencies
     set(_IDYNTREE_EXPORTED_DEPENDENCIES "")
     if(IDYNTREE_USES_YARP)
         list(APPEND _IDYNTREE_EXPORTED_DEPENDENCIES YARP)
@@ -68,14 +68,22 @@ if(NOT IDYNTREE_ONLY_DOCS)
         list(APPEND _IDYNTREE_EXPORTED_DEPENDENCIES orocos_kdl)
     endif()
 
+    # List exported CMake package dependencies when the library is compiled as static
+    set(_IDYNTREE_EXPORTED_DEPENDENCIES_ONLY_STATIC "")
+    list(APPEND _IDYNTREE_EXPORTED_DEPENDENCIES_ONLY_STATIC LibXml2)
+    if(IDYNTREE_USES_OSQPEIGEN)
+        list(APPEND _IDYNTREE_EXPORTED_DEPENDENCIES_ONLY_STATIC OsqpEigen)
+    endif()
+
     include(InstallBasicPackageFiles)
     install_basic_package_files(iDynTree VARS_PREFIX ${VARS_PREFIX}
                                          VERSION ${${VARS_PREFIX}_VERSION}
                                          COMPATIBILITY AnyNewerVersion
                                          TARGETS_PROPERTY ${VARS_PREFIX}_TARGETS
                                          NO_CHECK_REQUIRED_COMPONENTS_MACRO
                                          ENABLE_COMPATIBILITY_VARS
-                                         DEPENDENCIES ${_IDYNTREE_EXPORTED_DEPENDENCIES})
+                                         DEPENDENCIES ${_IDYNTREE_EXPORTED_DEPENDENCIES}
+                                         PRIVATE_DEPENDENCIES ${_IDYNTREE_EXPORTED_DEPENDENCIES_ONLY_STATIC})
 
     include(AddUninstallTarget)
 

diff --git a/cmake/iDynTreeDependencies.cmake b/cmake/iDynTreeDependencies.cmake
@@ -86,7 +86,7 @@ if (IDYNTREE_USES_ICUB)
 endif ()
 
 idyntree_handle_dependency(IPOPT)
-idyntree_handle_dependency(Irrlicht)
+idyntree_handle_dependency(Irrlicht DO_NOT_SILENTLY_SEARCH)
 idyntree_handle_dependency(Qt5 COMPONENTS Qml Quick Widgets)
 idyntree_handle_dependency(OsqpEigen MAIN_TARGET OsqpEigen::OsqpEigen)
 idyntree_handle_dependency(ALGLIB DO_NOT_SILENTLY_SEARCH)
@@ -96,6 +96,6 @@ if(IDYNTREE_USES_ALGLIB AND ALGLIB_FOUND)
     message(FATAL_ERROR "Exactly ALGLIB version ${ALGLIB_REQUIRED_VERSION} is required, but ${ALGLIB_VERSION} is available.")
   endif()
 endif()
-idyntree_handle_dependency(WORHP)
+idyntree_handle_dependency(WORHP DO_NOT_SILENTLY_SEARCH)
 # Workaround for https://github.com/robotology/idyntree/issues/599
 idyntree_handle_dependency(ASSIMP DO_NOT_SILENTLY_SEARCH MAIN_TARGET assimp::assimp)