feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix a couple of cmake issues for testing

Browse Source 
Correct expected paths, defines and dependencies.

Change-Id: Iae3fa708957e352012d0a6bb9cf97713b9a5c35e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Stenger
2021-01-27 08:22:50 +01:00
parent 388fd31db8
commit 9acde4f261
4 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/CMakeLists.txt
View File

@@ -161,6 +161,7 @@ extend_qtc_plugin(Core
extend_qtc_plugin(Core extend_qtc_plugin(Core
CONDITION WITH_TESTS CONDITION WITH_TESTS
DEFINES SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/locator"
SOURCES SOURCES
locator/locator_test.cpp locator/locator_test.cpp
locator/locatorfiltertest.cpp locator/locatorfiltertest.h locator/locatorfiltertest.cpp locator/locatorfiltertest.h

1
src/plugins/cpptools/CMakeLists.txt
View File

@@ -2,6 +2,7 @@ add_qtc_plugin(CppTools
DEPENDS Qt5::Network Qt5::Xml DEPENDS Qt5::Network Qt5::Xml
PUBLIC_DEPENDS CPlusPlus Qt5::Widgets PUBLIC_DEPENDS CPlusPlus Qt5::Widgets
PLUGIN_DEPENDS Core ProjectExplorer TextEditor PLUGIN_DEPENDS Core ProjectExplorer TextEditor
PLUGIN_TEST_DEPENDS CppEditor QmakeProjectManager
SOURCES SOURCES
abstracteditorsupport.cpp abstracteditorsupport.h abstracteditorsupport.cpp abstracteditorsupport.h
abstractoverviewmodel.h abstractoverviewmodel.h

2
src/plugins/valgrind/CMakeLists.txt
View File

@@ -57,7 +57,7 @@ extend_qtc_plugin(Valgrind
valgrindtestrunnertest.cpp valgrindtestrunnertest.h valgrindtestrunnertest.cpp valgrindtestrunnertest.h
DEFINES DEFINES
PARSERTESTS_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/unit_testdata" 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_SRC_DIR="${PROJECT_SOURCE_DIR}/tests/auto/valgrind/memcheck/testapps"
TESTRUNNER_APP_DIR="${PROJECT_BINARY_DIR}/tests/auto/valgrind/memcheck/testapps" TESTRUNNER_APP_DIR="${PROJECT_BINARY_DIR}/tests/auto/valgrind/memcheck/testapps"
) )

1
src/tools/valgrindfake/CMakeLists.txt
View File

@@ -1,5 +1,6 @@
add_qtc_executable(valgrind-fake add_qtc_executable(valgrind-fake
DEPENDS Qt5::Network Qt5::Xml DEPENDS Qt5::Network Qt5::Xml
SOURCES main.cpp outputgenerator.cpp outputgenerator.h SOURCES main.cpp outputgenerator.cpp outputgenerator.h
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
) )