← Back to branch summary

~ci-train-bot/ubuntu-system-settings/ubuntu-system-settings-ubuntu-zesty-2066

« back to all changes in this revision

Viewing changes to tests/CMakeLists.txt

  • Committer: Bileto Bot
  • Author(s): Jonas G. Drange
  • Date: 2016-09-30 13:48:06 UTC
  • mfrom: (1720.3.7 path-fixes)
  • Revision ID: ci-train-bot@canonical.com-20160930134806-tir714ireb8xzaau
uses XDG_DATA_DIRS where applicable to enable USS to find files and folders on snappy-based systems (LP: #1629009)

Approved by: Alberto Mardegan, Ken VanDine, Lukáš Tinkl, system-apps-ci-bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/CMakeLists.txt
10
10
 
11
11
add_definitions(-DI18N_DOMAIN="ubuntu-system-settings")
12
12
add_definitions(-DPLUGIN_PRIVATE_MODULE_DIR="${PLUGIN_PRIVATE_MODULE_DIR}")
 
13
add_definitions(-DPLUGIN_MODULE_DIR="${CMAKE_CURRENT_BINARY_DIR}")
 
14
add_definitions(-DMANIFEST_DIR="data")
13
15
add_definitions(-DPLUGIN_MANIFEST_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
14
 
add_definitions(-DPLUGIN_MODULE_DIR="${CMAKE_CURRENT_BINARY_DIR}")
 
16
add_definitions(-DQML_DIR="${CMAKE_CURRENT_BINARY_DIR}")
15
17
add_definitions(-DPLUGIN_QML_DIR="${CMAKE_CURRENT_BINARY_DIR}")
16
18
add_definitions(-DSYSTEM_IMAGE_DBUS_TEMPLATE="${CMAKE_SOURCE_DIR}/tests/autopilot/ubuntu_system_settings/tests/systemimage.py")
17
19
 
49
51
qt5_use_modules(tst-plugins Core Qml Test)
50
52
target_link_libraries(tst-plugins SystemSettings ${GLIB_LDFLAGS})
51
53
add_test(tst-plugins tst-plugins)
52
 
set_tests_properties(tst-plugins PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
 
54
set_tests_properties(tst-plugins PROPERTIES ENVIRONMENT
 
55
    "QT_QPA_PLATFORM=minimal;XDG_DATA_DIRS=${CMAKE_CURRENT_SOURCE_DIR}"
 
56
)
53
57
 
54
58
qt5_use_modules(tst-arguments Core Test)
55
59
target_link_libraries(tst-arguments ${GLIB_LDFLAGS})