aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2021-06-16 16:42:24 +0200
committerCristian Adam <cristian.adam@qt.io>2021-06-17 14:44:20 +0000
commit487e4a2e510c24986e22d53293da3e896c28c3ba (patch)
tree8111c71c3c2b7d39b9175ecfd64df841235d4832 /cmake
parent4ed8ee5aeaa3d7b7725de677acb692a5d998558f (diff)
unittest: Add missing tests (QmlDesigner, ClangTools and a few others)
Ups it to 2487 tests from 110 test suites. (from 1963 tests from 91 test suites) Change-Id: Id601bc8bbd43f129956be812e30a94081098c3cb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Findyaml-cpp.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/Findyaml-cpp.cmake b/cmake/Findyaml-cpp.cmake
index b122ea8a32..e4630ed720 100644
--- a/cmake/Findyaml-cpp.cmake
+++ b/cmake/Findyaml-cpp.cmake
@@ -17,7 +17,10 @@ if (yaml-cpp_FOUND)
endif()
set_target_properties(yaml-cpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}")
else()
- set(YAML_SOURCE_DIR ${PROJECT_SOURCE_DIR}/src/libs/3rdparty/yaml-cpp)
+ if(TARGET yaml-cpp)
+ return()
+ endif()
+ set(YAML_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../src/libs/3rdparty/yaml-cpp)
add_qtc_library(yaml-cpp
DEFINES YAML_CPP_DLL yaml_cpp_EXPORTS
INCLUDES ${YAML_SOURCE_DIR}/include