tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make tests optional

Browse source 
This patch makes it able to disable building tests by choice or unavailability of Qt5Test (by example of kwin).

REVIEW: 122984
This commit is contained in:
Andreas Sturmlechner 2015-09-07 17:42:37 +02:00 committed by Aleix Pol
parent cc148cea89
commit 1423000b44
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -10,7 +10,7 @@ cmake_minimum_required(VERSION 2.8.12)
find_package(ECM 0.0.9 REQUIRED NO_MODULE) find_package(ECM 0.0.9 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake)
find_package(Qt5 5.2 REQUIRED COMPONENTS Quick Test) find_package(Qt5 5.2 REQUIRED COMPONENTS Quick)
find_package(KF5 REQUIRED COMPONENTS I18n ConfigWidgets DBusAddons IconThemes) find_package(KF5 REQUIRED COMPONENTS I18n ConfigWidgets DBusAddons IconThemes)
find_package(Qca-qt5 2.1.0 REQUIRED) find_package(Qca-qt5 2.1.0 REQUIRED)
@ -49,7 +49,7 @@ add_subdirectory(plugins)
add_subdirectory(plasmoid) add_subdirectory(plasmoid)
add_subdirectory(cli) add_subdirectory(cli)
add_subdirectory(fileitemactionplugin) add_subdirectory(fileitemactionplugin)
if(BUILD_TESTING)
add_subdirectory(tests) add_subdirectory(tests)
endif()
install(PROGRAMS kdeconnect-non-plasma.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(PROGRAMS kdeconnect-non-plasma.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})

1
tests/CMakeLists.txt
View file

@ -1,3 +1,4 @@
find_package(Qt5 REQUIRED COMPONENTS Test)
find_package(KF5 REQUIRED COMPONENTS KIO) find_package(KF5 REQUIRED COMPONENTS KIO)
include_directories( include_directories(