generic: misc cleanups

diff --git a/libs/plasmagenericshell/CMakeLists.txt b/libs/plasmagenericshell/CMakeLists.txt
index f20c134..b07d0ce 100644 (file)
--- a/libs/plasmagenericshell/CMakeLists.txt
+++ b/libs/plasmagenericshell/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory(tests)
+if(ENABLE_TESTING)
+    add_subdirectory(tests)
+endif()
 
 set(appletbrowserdialog_SRCS
     widgetsexplorer/kcategorizeditemsviewmodels.cpp

diff --git a/libs/plasmagenericshell/tests/CMakeLists.txt b/libs/plasmagenericshell/tests/CMakeLists.txt
index 0035d9d..cad3f60 100644 (file)
--- a/libs/plasmagenericshell/tests/CMakeLists.txt
+++ b/libs/plasmagenericshell/tests/CMakeLists.txt
@@ -1,5 +1,3 @@
-if (KDE4_BUILD_TESTS)
-
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../widgetsexplorer)
 
 add_definitions(-DPLASMAGENERICSHELL_EXPORT=)
@@ -31,5 +29,3 @@ kde4_add_kcfg_files(backgrounddialog_SRCS ../../../plasma/desktop/shell/data/pla
 add_executable(plasmabackgrounddialog ${backgrounddialog_SRCS})
 target_link_libraries(plasmabackgrounddialog ${KDE4_PLASMA_LIBS} ${QT_QTUITOOLS_LIBRARY} ${KDE4_KFILE_LIBRARY} kworkspace)
 
-endif (KDE4_BUILD_TESTS)
-