From f0bc06820630c04dc97f07c550de90ef2607ebc0 Mon Sep 17 00:00:00 2001 From: mjbogusz Date: Tue, 22 May 2018 17:39:10 +0200 Subject: [PATCH] Fix build with yaml-cpp installed system-wise (#160) --- rviz_yaml_cpp_vendor/rviz_yaml_cpp_vendor-extras.cmake.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rviz_yaml_cpp_vendor/rviz_yaml_cpp_vendor-extras.cmake.in b/rviz_yaml_cpp_vendor/rviz_yaml_cpp_vendor-extras.cmake.in index 8538c7c32..3cbb55ca3 100644 --- a/rviz_yaml_cpp_vendor/rviz_yaml_cpp_vendor-extras.cmake.in +++ b/rviz_yaml_cpp_vendor/rviz_yaml_cpp_vendor-extras.cmake.in @@ -1,6 +1,8 @@ -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") @@ -8,7 +10,7 @@ if(NOT yaml-cpp_FOUND) 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)