Honor BUILD_TESTING
Test Plan: * Passed `BUILD_TESTING=OFF` option to cmake, no tests have been built; * Didn't pass `BUILD_TESTING` option, all tests have been built. Reviewers: #kwin, graesslin Reviewed By: #kwin, graesslin Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D13163
This commit is contained in:
parent
99532fb95c
commit
54b69bec44
2 changed files with 36 additions and 32 deletions
|
@ -690,10 +690,13 @@ ecm_install_icons(
|
|||
)
|
||||
|
||||
add_subdirectory(qml)
|
||||
add_subdirectory(autotests)
|
||||
add_subdirectory(tests)
|
||||
add_subdirectory(packageplugins)
|
||||
|
||||
if (BUILD_TESTING)
|
||||
add_subdirectory(autotests)
|
||||
add_subdirectory(tests)
|
||||
endif()
|
||||
|
||||
if (KF5DocTools_FOUND)
|
||||
add_subdirectory(doc)
|
||||
endif()
|
||||
|
|
|
@ -9,8 +9,6 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FR
|
|||
|
||||
include_directories(${KWIN_SOURCE_DIR}/effects)
|
||||
|
||||
include(ECMMarkAsTest)
|
||||
|
||||
################# configure checks and create the configured files #################
|
||||
|
||||
# now create config headers
|
||||
|
@ -47,38 +45,41 @@ target_link_libraries(kwincompositing
|
|||
kwin4_effect_builtins
|
||||
)
|
||||
|
||||
if (BUILD_TESTING)
|
||||
include(ECMMarkAsTest)
|
||||
|
||||
set(modelTest_SRC
|
||||
model.cpp
|
||||
effectconfig.cpp
|
||||
compositing.cpp
|
||||
test/effectmodeltest.cpp
|
||||
test/modeltest.cpp)
|
||||
set(modelTest_SRC
|
||||
model.cpp
|
||||
effectconfig.cpp
|
||||
compositing.cpp
|
||||
test/effectmodeltest.cpp
|
||||
test/modeltest.cpp)
|
||||
|
||||
qt5_add_dbus_interface( modelTest_SRC
|
||||
${KWIN_SOURCE_DIR}/org.kde.kwin.Compositing.xml kwin_compositing_interface)
|
||||
qt5_add_dbus_interface( modelTest_SRC
|
||||
${KWIN_SOURCE_DIR}/org.kde.kwin.Effects.xml kwin_effects_interface)
|
||||
qt5_add_dbus_interface(modelTest_SRC
|
||||
${KWIN_SOURCE_DIR}/org.kde.kwin.Compositing.xml kwin_compositing_interface)
|
||||
qt5_add_dbus_interface(modelTest_SRC
|
||||
${KWIN_SOURCE_DIR}/org.kde.kwin.Effects.xml kwin_effects_interface)
|
||||
|
||||
add_executable(effectModelTest ${modelTest_SRC})
|
||||
ecm_mark_as_test(effectModelTest)
|
||||
add_executable(effectModelTest ${modelTest_SRC})
|
||||
ecm_mark_as_test(effectModelTest)
|
||||
|
||||
target_link_libraries(effectModelTest
|
||||
Qt5::Quick
|
||||
Qt5::QuickWidgets
|
||||
Qt5::DBus
|
||||
Qt5::Test
|
||||
Qt5::Widgets
|
||||
KF5::CoreAddons
|
||||
KF5::ConfigCore
|
||||
KF5::Declarative
|
||||
KF5::I18n
|
||||
KF5::Service
|
||||
KF5::KCMUtils
|
||||
KF5::NewStuff
|
||||
kwineffects
|
||||
kwin4_effect_builtins
|
||||
)
|
||||
target_link_libraries(effectModelTest
|
||||
Qt5::Quick
|
||||
Qt5::QuickWidgets
|
||||
Qt5::DBus
|
||||
Qt5::Test
|
||||
Qt5::Widgets
|
||||
KF5::CoreAddons
|
||||
KF5::ConfigCore
|
||||
KF5::Declarative
|
||||
KF5::I18n
|
||||
KF5::Service
|
||||
KF5::KCMUtils
|
||||
KF5::NewStuff
|
||||
kwineffects
|
||||
kwin4_effect_builtins
|
||||
)
|
||||
endif()
|
||||
|
||||
INSTALL(DIRECTORY qml DESTINATION ${DATA_INSTALL_DIR}/kwincompositing)
|
||||
INSTALL(TARGETS kwincompositing DESTINATION ${PLUGIN_INSTALL_DIR})
|
||||
|
|
Loading…
Reference in a new issue