diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2020-02-25 17:39:00 +0100 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2020-02-26 17:47:29 +0000 |
| commit | 18386c7117e8c0dc7ed40fac2f7b06545f0ebb86 (patch) | |
| tree | 9fd26368e9175aa402939ad44bfb41f01de3b6f1 /cmake | |
| parent | da5d53b89b85d61808d130f5442fe27c0ef7cb83 (diff) | |
CMake Build: Fix yaml-cpp include directory detection
On Ubuntu 19.10 the libyaml-cpp-dev CMake config module has a broken
value for YAML_CPP_INCLUDE_DIR.
Change-Id: I5097ef656b988dda0326a15b521b92cbbdb0a390
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Findyaml-cpp.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmake/Findyaml-cpp.cmake b/cmake/Findyaml-cpp.cmake index bcdcfd104b..3d5828ebd8 100644 --- a/cmake/Findyaml-cpp.cmake +++ b/cmake/Findyaml-cpp.cmake @@ -10,6 +10,11 @@ find_package(yaml-cpp 0.5 QUIET NO_MODULE) if (yaml-cpp_FOUND) # target doesn't set include directory for some reason get_filename_component(yaml_cpp_include_dir ${YAML_CPP_INCLUDE_DIR} ABSOLUTE) + if (NOT EXISTS yaml_cpp_include_dir) + unset(yaml_cpp_include_dir) + unset(yaml_cpp_include_dir CACHE) + find_path(yaml_cpp_include_dir yaml-cpp/yaml.h) + endif() target_include_directories(yaml-cpp INTERFACE ${yaml_cpp_include_dir}) else() set(yaml-cpp_FOUND 1) |