Revert "Use system installed yaml-cpp 0.6 if available (#8)"

This reverts commit b11d00f. Signed-off-by: Ivan Santiago Paunovic <[email protected]>
ros2 · Aug 24, 2020 · de7e3d0 · de7e3d0
1 parent b11d00f
commit de7e3d0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -65,27 +65,22 @@ macro(build_yaml_cpp)
   )
 endmacro()
 
-find_package(yaml-cpp 0.6 QUIET)
-if(NOT yaml-cpp_FOUND)
-  build_yaml_cpp()
+build_yaml_cpp()
 
-  if(WIN32)
-    ament_environment_hooks(env_hook/yaml_cpp_vendor_library_path.bat)
-    set(ENV_VAR_NAME "PATH")
-    set(ENV_VAR_VALUE "opt\\yaml_cpp_vendor\\bin")
+if(WIN32)
+  ament_environment_hooks(env_hook/yaml_cpp_vendor_library_path.bat)
+  set(ENV_VAR_NAME "PATH")
+  set(ENV_VAR_VALUE "opt\\yaml_cpp_vendor\\bin")
+else()
+  ament_environment_hooks(env_hook/yaml_cpp_vendor_library_path.sh)
+  if(APPLE)
+    set(ENV_VAR_NAME "DYLD_LIBRARY_PATH")
   else()
-    ament_environment_hooks(env_hook/yaml_cpp_vendor_library_path.sh)
-    if(APPLE)
-      set(ENV_VAR_NAME "DYLD_LIBRARY_PATH")
-    else()
-      set(ENV_VAR_NAME "LD_LIBRARY_PATH")
-    endif()
-    set(ENV_VAR_VALUE "opt/yaml_cpp_vendor/lib")
+    set(ENV_VAR_NAME "LD_LIBRARY_PATH")
   endif()
-  ament_environment_hooks(env_hook/yaml_cpp_vendor_library_path.dsv.in)
-else()
-  message(STATUS "Found yaml-cpp ${yaml-cpp_VERSION}")
+  set(ENV_VAR_VALUE "opt/yaml_cpp_vendor/lib")
 endif()
+ament_environment_hooks(env_hook/yaml_cpp_vendor_library_path.dsv.in)
 
 ament_package(
   CONFIG_EXTRAS "yaml_cpp_vendor-extras.cmake.in"

diff --git a/yaml_cpp_vendor-extras.cmake.in b/yaml_cpp_vendor-extras.cmake.in
@@ -1,16 +1,18 @@
-find_package(yaml-cpp 0.6 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/yaml_cpp_vendor/CMake")
   else()
     set(yaml-cpp_DIR "${@PROJECT_NAME@_DIR}/../../../opt/yaml_cpp_vendor/lib/cmake/yaml-cpp")
   endif()
   message(STATUS "Setting yaml-cpp_DIR to: '${yaml-cpp_DIR}'")
+# endif()
 
-  find_package(yaml-cpp CONFIG REQUIRED QUIET)
-endif()
+find_package(yaml-cpp CONFIG REQUIRED QUIET)
 
 set(yaml_cpp_vendor_LIBRARIES ${YAML_CPP_LIBRARIES})
 set(yaml_cpp_vendor_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})