Fix a couple of cmake issues for testing

Correct expected paths, defines and dependencies.

Change-Id: Iae3fa708957e352012d0a6bb9cf97713b9a5c35e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

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

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

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"
 )

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}
 )