tests and autotests in top level dir

CMakeLists.txt

@@ -163,5 +163,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma_version.h
 add_subdirectory(src)
 add_subdirectory(desktoptheme)
 add_subdirectory(examples)
+add_subdirectory(autotests)
+add_subdirectory(tests)
 
 feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)

autotests/CMakeLists.txt

@@ -31,7 +31,7 @@ PLASMA_UNIT_TESTS(
     #runnercontexttest
 )
 
-add_executable(storagetest storagetest.cpp ../private/storage.cpp ../private/storagethread.cpp)
+add_executable(storagetest storagetest.cpp ../src/plasma/private/storage.cpp ../src/plasma/private/storagethread.cpp)
 target_link_libraries(storagetest Qt5::Test Qt5::Declarative Qt5::Sql KF5::KIOCore KF5::Plasma KF5::CoreAddons )
 add_test(plasma-storagetest storagetest)
 ecm_mark_as_test(storagetest)

src/plasma/CMakeLists.txt

@@ -36,8 +36,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-plasma.h.cmake ${CMAKE_CURRENT
 #FIXME: gpgme++ is in kdepimlibs, must move somewhere else!
 include_directories(${KDEPIMLIBS_INCLUDE_DIRS} ${GPGME_INCLUDES})
 
-add_subdirectory(autotests)
-add_subdirectory(tests)
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1209)
 
 ########### next target ###############