From 9acde4f261476477330c78b87b9a19c12eed7755 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 27 Jan 2021 08:22:50 +0100 Subject: [PATCH] Fix a couple of cmake issues for testing Correct expected paths, defines and dependencies. Change-Id: Iae3fa708957e352012d0a6bb9cf97713b9a5c35e Reviewed-by: Eike Ziller --- src/plugins/coreplugin/CMakeLists.txt | 1 + src/plugins/cpptools/CMakeLists.txt | 1 + src/plugins/valgrind/CMakeLists.txt | 2 +- src/tools/valgrindfake/CMakeLists.txt | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/coreplugin/CMakeLists.txt b/src/plugins/coreplugin/CMakeLists.txt index 12e38d45a65..3d3e6f3a289 100644 --- a/src/plugins/coreplugin/CMakeLists.txt +++ b/src/plugins/coreplugin/CMakeLists.txt @@ -161,6 +161,7 @@ extend_qtc_plugin(Core extend_qtc_plugin(Core CONDITION WITH_TESTS + DEFINES SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/locator" SOURCES locator/locator_test.cpp locator/locatorfiltertest.cpp locator/locatorfiltertest.h diff --git a/src/plugins/cpptools/CMakeLists.txt b/src/plugins/cpptools/CMakeLists.txt index 3789b65b629..e1aab60cc95 100644 --- a/src/plugins/cpptools/CMakeLists.txt +++ b/src/plugins/cpptools/CMakeLists.txt @@ -2,6 +2,7 @@ add_qtc_plugin(CppTools DEPENDS Qt5::Network Qt5::Xml PUBLIC_DEPENDS CPlusPlus Qt5::Widgets PLUGIN_DEPENDS Core ProjectExplorer TextEditor + PLUGIN_TEST_DEPENDS CppEditor QmakeProjectManager SOURCES abstracteditorsupport.cpp abstracteditorsupport.h abstractoverviewmodel.h diff --git a/src/plugins/valgrind/CMakeLists.txt b/src/plugins/valgrind/CMakeLists.txt index fe8452d8125..797f3011bb7 100644 --- a/src/plugins/valgrind/CMakeLists.txt +++ b/src/plugins/valgrind/CMakeLists.txt @@ -57,7 +57,7 @@ extend_qtc_plugin(Valgrind valgrindtestrunnertest.cpp valgrindtestrunnertest.h DEFINES PARSERTESTS_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/unit_testdata" - VALGRIND_FAKE_PATH="${PROJECT_SOURCE_DIR}/src/tools/valgrindfake" + VALGRIND_FAKE_PATH="${PROJECT_BINARY_DIR}/src/tools/valgrindfake" TESTRUNNER_SRC_DIR="${PROJECT_SOURCE_DIR}/tests/auto/valgrind/memcheck/testapps" TESTRUNNER_APP_DIR="${PROJECT_BINARY_DIR}/tests/auto/valgrind/memcheck/testapps" ) diff --git a/src/tools/valgrindfake/CMakeLists.txt b/src/tools/valgrindfake/CMakeLists.txt index 93944f3913e..6c2c709c4c1 100644 --- a/src/tools/valgrindfake/CMakeLists.txt +++ b/src/tools/valgrindfake/CMakeLists.txt @@ -1,5 +1,6 @@ add_qtc_executable(valgrind-fake DEPENDS Qt5::Network Qt5::Xml SOURCES main.cpp outputgenerator.cpp outputgenerator.h + PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )