this is needed, when the test b-d's are not available (according to
Savic)
=== modified file 'cmake/modules/Plugins.cmake'
--- cmake/modules/Plugins.cmake 2013-07-16 08:28:59 +0000
+++ cmake/modules/Plugins.cmake 2013-08-07 12:09:03 +0000
@@ -40,16 +40,20 @@
set(multi_value_keywords TARGETS)
cmake_parse_arguments(qmlplugin "" "" "${multi_value_keywords}" ${ARGN})
- # create the plugin.qmltypes file
- add_custom_target(${PLUGIN}-qmltypes ALL
- COMMAND qmlplugindump -notrelocatable ${PLUGIN} ${VERSION}
${CMAKE_BINARY_DIR}/plugins >
${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes
- )
- add_dependencies(${PLUGIN}-qmltypes ${PLUGIN}-qmlfiles
${qmlplugin_TARGETS})
-
- # install the qmltypes file.
- install(FILES ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes
- DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}
- )
+ find_program(qmlplugindump_exe qmlplugindump /usr/lib/*/qt5/bin
NO_DEFAULT_PATH)
+
+ if(qmlplugindump_exe)
+ # create the plugin.qmltypes file
+ add_custom_target(${PLUGIN}-qmltypes ALL
+ COMMAND ${qmlplugindump_exe} -notrelocatable ${PLUGIN} ${VERSION}
${CMAKE_BINARY_DIR}/plugins >
${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes
+ )
+ add_dependencies(${PLUGIN}-qmltypes ${PLUGIN}-qmlfiles
${qmlplugin_TARGETS})
+
+ # install the qmltypes file.
+ install(FILES
${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes
+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}
+ )
+ endif()
# install the additional targets
install(TARGETS ${qmlplugin_TARGETS}
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1209241
Title:
changes for unity8 cross-build required
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1209241/+subscriptions
--
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
