Skip to content
Permalink
Browse files

Fix build with yaml-cpp installed system-wise (#160)

  • Loading branch information...
mjbogusz authored and mikaelarguedas committed May 22, 2018
1 parent 1b09223 commit 865464d8aeaba754eb43a8c4e47be06d6a2f0f89
Showing with 5 additions and 3 deletions.
  1. +5 −3 rviz_yaml_cpp_vendor-extras.cmake.in
@@ -1,14 +1,16 @@
find_package(yaml-cpp QUIET)
## mjbogusz: find_package() and if() disabled until ament can handle complex paths resolving to /usr/include
## always use locally built yaml-cpp for now
# find_package(yaml-cpp QUIET)

if(NOT yaml-cpp_FOUND)
# if(NOT yaml-cpp_FOUND)
# add the local Modules directory to the modules path
if(WIN32)
set(yaml-cpp_DIR "${@PROJECT_NAME@_DIR}/../../../opt/rviz_yaml_cpp_vendor/CMake")
else()
set(yaml-cpp_DIR "${@PROJECT_NAME@_DIR}/../../../opt/rviz_yaml_cpp_vendor/lib/cmake/yaml-cpp")
endif()
message(STATUS "Setting yaml-cpp_DIR to: '${yaml-cpp_DIR}'")
endif()
# endif()

find_package(yaml-cpp CONFIG REQUIRED QUIET)

0 comments on commit 865464d

Please sign in to comment.
You can’t perform that action at this time.