Skip to content

Full fix for broken yaml detection #1881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MrSoup678 wants to merge 5 commits into from
Closed

Full fix for broken yaml detection #1881

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa4d263
Full fix for broken yaml
MrSoup678 Oct 6, 2023
f14e3af
Merge branch 'main' into yaml-fix
MrSoup678 Oct 8, 2023
ed9b4b7
Merge branch 'main' into yaml-fix
MrSoup678 Oct 27, 2023
e1a127d
Merge branch 'main' into yaml-fix
MrSoup678 Oct 28, 2023
c67164e
Fixed inconsistent indents
MrSoup678 Oct 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions share/cmake/modules/Findyaml-cpp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,20 @@ endif()

if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
set(_yaml-cpp_REQUIRED_VARS yaml-cpp_LIBRARY)

if(NOT DEFINED yaml-cpp_ROOT)
# Search for yaml-cpp-config.cmake
find_package(yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG QUIET)
endif()

if(yaml-cpp_FOUND)
get_target_property(yaml-cpp_LIBRARY yaml-cpp LOCATION)
if(TARGET yaml-cpp::yaml-cpp)
Comment thread
MrSoup678 marked this conversation as resolved.
# yaml-cpp >= 0.8
get_target_property(yaml-cpp_LIBRARY yaml-cpp::yaml-cpp LOCATION)
get_target_property(yaml-cpp_INCLUDE_DIR yaml-cpp::yaml-cpp INCLUDE_DIRECTORIES)
else()
get_target_property(yaml-cpp_LIBRARY yaml-cpp LOCATION)
get_target_property(yaml-cpp_INCLUDE_DIR yaml-cpp INCLUDE_DIRECTORIES)
endif()
else()

# As yaml-cpp-config.cmake search fails, search an installed library
Expand Down