Merge pull request #236 from traversaro/patch-2

Fix find_package(manif) if tl-optional_FOUND is TRUE
artivis · Jul 21, 2021 · c13c097 · c13c097
2 parents 436702d + 1a7abca
commit c13c097
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -101,6 +101,13 @@ else(TARGET Eigen3::Eigen)
   target_include_directories(${PROJECT_NAME} SYSTEM INTERFACE ${EIGEN3_INCLUDE_DIRS})
 endif(TARGET Eigen3::Eigen)
 
+# Add tl-optional interface dependency if enabled
+if(tl-optional_FOUND)
+  set(tl-optional_DEPENDENCY "find_dependency(tl-optional)")
+else()
+  set(tl-optional_DEPENDENCY "")
+endif()
+
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   target_compile_options(${PROJECT_NAME} INTERFACE -ftemplate-depth=512)
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")

diff --git a/cmake/manifConfig.cmake.in b/cmake/manifConfig.cmake.in
@@ -2,6 +2,7 @@
 
 include(CMakeFindDependencyMacro)
 @Eigen3_DEPENDENCY@
+@tl-optional_DEPENDENCY@
 
 if(NOT TARGET @PROJECT_NAME@)
   include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")