File tree 1 file changed +4
-6
lines changed
1 file changed +4
-6
lines changed Original file line number Diff line number Diff line change 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 )
4
2
5
- # if(NOT yaml-cpp_FOUND)
3
+ if (NOT yaml-cpp_FOUND)
6
4
# add the local Modules directory to the modules path
7
5
if (WIN32 )
8
6
set (yaml-cpp_DIR "${@PROJECT_NAME@_DIR}/../../../opt/yaml_cpp_vendor/CMake" )
9
7
else ()
10
8
set (yaml-cpp_DIR "${@PROJECT_NAME@_DIR}/../../../opt/yaml_cpp_vendor/lib/cmake/yaml-cpp" )
11
9
endif ()
12
10
message (STATUS "Setting yaml-cpp_DIR to: '${yaml-cpp_DIR}'" )
13
- # endif()
14
11
15
- find_package (yaml-cpp CONFIG REQUIRED QUIET )
12
+ find_package (yaml-cpp CONFIG REQUIRED QUIET )
13
+ endif ()
16
14
17
15
set (yaml_cpp_vendor_LIBRARIES ${YAML_CPP_LIBRARIES} )
18
16
set (yaml_cpp_vendor_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR} )
You can’t perform that action at this time.
0 commit comments