Skip to content

Commit c1fe055

Browse files
authored
Find yaml-cpp before build.
1 parent 27a4f6b commit c1fe055

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

Diff for: yaml_cpp_vendor-extras.cmake.in

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
## mjbogusz: find_package() and if() disabled until ament can handle complex paths resolving to /usr/include
2-
## always use locally built yaml-cpp for now
3-
# find_package(yaml-cpp QUIET)
1+
find_package(yaml-cpp 0.6 QUIET)
42

5-
# if(NOT yaml-cpp_FOUND)
3+
if(NOT yaml-cpp_FOUND)
64
# add the local Modules directory to the modules path
75
if(WIN32)
86
set(yaml-cpp_DIR "${@PROJECT_NAME@_DIR}/../../../opt/yaml_cpp_vendor/CMake")
97
else()
108
set(yaml-cpp_DIR "${@PROJECT_NAME@_DIR}/../../../opt/yaml_cpp_vendor/lib/cmake/yaml-cpp")
119
endif()
1210
message(STATUS "Setting yaml-cpp_DIR to: '${yaml-cpp_DIR}'")
13-
# endif()
1411

15-
find_package(yaml-cpp CONFIG REQUIRED QUIET)
12+
find_package(yaml-cpp CONFIG REQUIRED QUIET)
13+
endif()
1614

1715
set(yaml_cpp_vendor_LIBRARIES ${YAML_CPP_LIBRARIES})
1816
set(yaml_cpp_vendor_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})

0 commit comments

Comments
 (0)