diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-12-17 13:10:44 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-12-17 13:10:44 +0100 |
| commit | 5572bc72200abe072b958142ebb76248b9c45383 (patch) | |
| tree | a29601616c667b3b8f3b51595d9fa2147c824e73 /cmake | |
| parent | 6a2a07d516f809c5be39de4d8ecb69354f0fe935 (diff) | |
| parent | 1ae893de26b91c42b041d8e15b9a2651d809b69d (diff) | |
| download | qt-creator-5572bc72200abe072b958142ebb76248b9c45383.tar.gz | |
Merge remote-tracking branch 'origin/4.14'
Change-Id: Ie52e046f8e280e8c39f0cc5e9e710b4f885010a6
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Findyaml-cpp.cmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cmake/Findyaml-cpp.cmake b/cmake/Findyaml-cpp.cmake index 2c5b2a60d2..b122ea8a32 100644 --- a/cmake/Findyaml-cpp.cmake +++ b/cmake/Findyaml-cpp.cmake @@ -17,8 +17,6 @@ if (yaml-cpp_FOUND) endif() set_target_properties(yaml-cpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}") else() - set(yaml-cpp_FOUND 1) - set_package_properties(yaml-cpp PROPERTIES DESCRIPTION "using internal src/libs/3rdparty/yaml-cpp") set(YAML_SOURCE_DIR ${PROJECT_SOURCE_DIR}/src/libs/3rdparty/yaml-cpp) add_qtc_library(yaml-cpp DEFINES YAML_CPP_DLL yaml_cpp_EXPORTS @@ -114,8 +112,12 @@ else() ${YAML_SOURCE_DIR}/src/tag.h ${YAML_SOURCE_DIR}/src/token.h ) - if(MSVC) - target_compile_options(yaml-cpp PUBLIC /wd4251 /wd4275) + if(TARGET yaml-cpp) + set(yaml-cpp_FOUND 1) + set_package_properties(yaml-cpp PROPERTIES DESCRIPTION "using internal src/libs/3rdparty/yaml-cpp") + if(MSVC) + target_compile_options(yaml-cpp PUBLIC /wd4251 /wd4275) + endif() endif() unset(YAML_SOURCE_DIR) endif() |