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

ros2 · May 22, 2018 · f0bc068 · f0bc068
1 parent d69b6f1
commit f0bc068
Showing 1 changed file with 5 additions and 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
@@ -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)