← Back to branch summary

~marcustomlinson/unity8/scope-tool-unix-signals

« back to all changes in this revision

Viewing changes to cmake/modules/QmlPlugins.cmake

  • Committer: CI Train Bot
  • Author(s): Michael Zanetti, Michał Sawicz, Albert Astals Cid
  • Date: 2015-06-18 19:39:54 UTC
  • mfrom: (1752.7.26 refactor-qmltests)
  • Revision ID: ci-train-bot@canonical.com-20150618193954-4l4yjxwshcly5l7s
Refactor QmlTest.cmake module so that all tests can go through it.
Also a bit of cleanup around tests.

ARTIFACTS_DIR directs xunitxml output to that dir
QUIET_LOGGER lets you disable stdout logging
Approved by: Michael Zanetti

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmake/modules/QmlPlugins.cmake
107
107
    set(multi TARGETS)
108
108
    cmake_parse_arguments(QMLPLUGIN "${options}" "${single}" "${multi}" ${ARGN})
109
109
 
110
 
    get_target_property(qmlplugindump_executable qmlplugindump LOCATION)
111
 
 
112
110
    if(QMLPLUGIN_BINARY_DIR)
113
111
        set(qmlplugin_dir ${QMLPLUGIN_BINARY_DIR}/${PATH})
114
112
    else()
127
125
        set(qmltypes_path ${CMAKE_CURRENT_SOURCE_DIR}/${plugin_suffix}.qmltypes)
128
126
 
129
127
        add_custom_target(${target_prefix}-qmltypes
130
 
            COMMAND env ${QMLPLUGIN_ENVIRONMENT} ${qmlplugindump_executable} -notrelocatable
 
128
            COMMAND env ${QMLPLUGIN_ENVIRONMENT} $<TARGET_FILE:qmlplugindump> -notrelocatable
131
129
                    ${PLUGIN} ${VERSION} ${QMLPLUGIN_MODULE_DIR} > ${qmltypes_path}
132
130
                    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
133
131
        )