aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2023-08-24 13:41:33 +0200
committerEike Ziller <eike.ziller@qt.io>2023-08-25 09:21:42 +0000
commit170f9acfb41704b68e2ba98690fd6d5e98addd85 (patch)
treeb9b39483dff1acb47e0420d1c138a7d42ae9167e
parentf2da62fd22422539ad919a8252ed078847788f9f (diff)
ClangTools: Add support for yaml-cpp 0.8
They renamed their target from `yaml-cpp` to `yaml-cpp::yaml-cpp` Still support < 0.8 though. Fixes: QTCREATORBUG-29537 Change-Id: Iafa6e75998f0120610542b4c744b205aee3392a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: David Schulz <david.schulz@qt.io>
-rw-r--r--cmake/Findyaml-cpp.cmake10
1 files changed, 9 insertions, 1 deletions
diff --git a/cmake/Findyaml-cpp.cmake b/cmake/Findyaml-cpp.cmake
index e7b3d361d3..0b0e81418a 100644
--- a/cmake/Findyaml-cpp.cmake
+++ b/cmake/Findyaml-cpp.cmake
@@ -15,7 +15,15 @@ if (yaml-cpp_FOUND)
unset(yaml_cpp_include_dir CACHE)
find_path(yaml_cpp_include_dir yaml-cpp/yaml.h)
endif()
- set_target_properties(yaml-cpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}")
+ if(TARGET yaml-cpp::yaml-cpp)
+ # yaml-cpp >= 0.8
+ set_property(TARGET yaml-cpp::yaml-cpp PROPERTY IMPORTED_GLOBAL TRUE)
+ add_library(yaml-cpp ALIAS yaml-cpp::yaml-cpp)
+ set(yaml-cpp_TARGET yaml-cpp::yaml-cpp)
+ else()
+ set(yaml-cpp_TARGET yaml-cpp)
+ endif()
+ set_target_properties(${yaml-cpp_TARGET} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}")
else()
if(TARGET yaml-cpp)
return()