git.iko.soy/unity8
on xenial help sign in
reverted changes for qmltypes
commit972288a6cd9eaba4654958e2dfa0585378d2ff7a authorNick Dedekind <nicholas.dedekind@gmail.com> dateMon 8 Jul 2013, 16:09 (13 years ago) parent8ef502a
14 files changed+67−61
compare with xenial
unifiedsplit
cmake/modules/Plugins.cmake+14−24 plugins/HudClient/CMakeLists.txt+1−2 plugins/LightDM/CMakeLists.txt+1−2 plugins/ListViewWithPageHeader/CMakeLists.txt+1−2 plugins/Ubuntu/Gestures/CMakeLists.txt+1−2 plugins/Unity/CMakeLists.txt+1−2 plugins/Unity/Indicators/CMakeLists.txt+3−5 plugins/Unity/Indicators/Messaging/qml/CMakeLists.txt+14−4 plugins/Unity/Indicators/Network/CMakeLists.txt+3−6 plugins/Unity/Indicators/Network/qml/CMakeLists.txt+14−4 plugins/Unity/Indicators/Network/qml/qmldir−1 plugins/Unity/Indicators/qml/CMakeLists.txt+13−4 plugins/Unity/Indicators/qml/qmldir−1 plugins/Utils/CMakeLists.txt+1−2
cmake/modules/Plugins.cmake+14−24
@@ -1,12 +1,17 @@
1−# Creates target for copying and installing qmlfiles
1+# Creates targets for copying and installing qmlfiles and generating the qmltypes file for a plugin
22#
3−# export_qmlfiles(plugin sub_path)
3+# export_qmlplugin(plugin version sub_path [TARGETS target1 [target2 ...]])
44#
5+# TARGETS additional install targets (eg the plugin shared object)
56#
67# Two targets will be created:
78# - plugin-qmlfiles - Copies the qml files (*.qml, *.js, qmldir) into the shadow build folder.
9+# - plugin-qmltypes - Generates the qmltypes file in the shadow build folder.
10+
811
9−macro(export_qmlfiles PLUGIN PLUGIN_SUBPATH)
12+macro(export_qmlplugin PLUGIN VERSION PLUGIN_SUBPATH)
13+ set(multi_value_keywords TARGETS)
14+ cmake_parse_arguments(qmlplugin "" "" "${multi_value_keywords}" ${ARGN})
1015
1116 file(GLOB QMLFILES
1217 *.qml
@@ -20,32 +25,17 @@ macro(export_qmlfiles PLUGIN PLUGIN_SUBPATH)
2025 DEPENDS ${QMLFILES}
2126 )
2227
23− # install the qmlfiles file.
24− install(FILES ${QMLFILES}
25− DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}
26− )
27−endmacro(export_qmlfiles)
28−
29−
30−# Creates target for generating the qmltypes file for a plugin and installs plugin files
31−#
32−# export_qmlplugin(plugin version sub_path [TARGETS target1 [target2 ...]])
33−#
34−# TARGETS additional install targets (eg the plugin shared object)
35−#
36−# Two targets will be created:
37−# - plugin-qmltypes - Generates the qmltypes file in the shadow build folder.
38−
39−macro(export_qmlplugin PLUGIN VERSION PLUGIN_SUBPATH)
40− set(multi_value_keywords TARGETS)
41− cmake_parse_arguments(qmlplugin "" "" "${multi_value_keywords}" ${ARGN})
42−
4328 # create the plugin.qmltypes file
4429 add_custom_target(${PLUGIN}-qmltypes ALL
4530 COMMAND qmlplugindump -notrelocatable ${PLUGIN} ${VERSION} ${CMAKE_BINARY_DIR}/plugins > ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes
4631 )
4732 add_dependencies(${PLUGIN}-qmltypes ${PLUGIN}-qmlfiles ${qmlplugin_TARGETS})
4833
34+ # install the qmldir file.
35+ install(FILES ${QMLFILES}
36+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}
37+ )
38+
4939 # install the qmltypes file.
5040 install(FILES ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes
5141 DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}
@@ -55,4 +45,4 @@ macro(export_qmlplugin PLUGIN VERSION PLUGIN_SUBPATH)
5545 install(TARGETS ${qmlplugin_TARGETS}
5646 DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}
5747 )
58−endmacro(export_qmlplugin)
48+endmacro(export_qmlplugin)
plugins/HudClient/CMakeLists.txt+1−2
@@ -38,6 +38,5 @@ target_link_libraries(HudClientQml
3838
3939qt5_use_modules(HudClientQml Qml)
4040
41−# export the qmldir qmltypes and plugin files
42−export_qmlfiles(HudClient HudClient)
41+# export the qmldir and qmltypes files
4342export_qmlplugin(HudClient 0.1 HudClient TARGETS HudClientQml)
plugins/LightDM/CMakeLists.txt+1−2
@@ -35,6 +35,5 @@ target_link_libraries(LightDM-qml
3535
3636qt5_use_modules(LightDM-qml Gui Qml)
3737
38−# export the qmldir qmltypes and plugin files
39−export_qmlfiles(LightDM LightDM)
38+# export the qmldir and qmltypes files
4039export_qmlplugin(LightDM 0.1 LightDM TARGETS LightDM-qml)
plugins/ListViewWithPageHeader/CMakeLists.txt+1−2
@@ -33,6 +33,5 @@ target_link_libraries(ListViewWithPageHeader-qml
3333
3434qt5_use_modules(ListViewWithPageHeader-qml Qml Quick)
3535
36−# export the qmldir qmltypes and plugin files
37−export_qmlfiles(ListViewWithPageHeader ListViewWithPageHeader)
36+# export the qmldir and qmltypes files
3837export_qmlplugin(ListViewWithPageHeader 0.1 ListViewWithPageHeader TARGETS ListViewWithPageHeader-qml)
plugins/Ubuntu/Gestures/CMakeLists.txt+1−2
@@ -23,6 +23,5 @@ qt5_use_modules(UbuntuGestureQml Core Quick)
2323# So that Foo.cpp can #include "Foo.moc"
2424include_directories(${CMAKE_CURRENT_BINARY_DIR})
2525
26−# export the qmldir qmltypes and plugin files
27−export_qmlfiles(Ubuntu.Gestures Ubuntu/Gestures)
26+# export the qmldir and qmltypes files
2827export_qmlplugin(Ubuntu.Gestures 0.1 Ubuntu/Gestures TARGETS UbuntuGestureQml)
plugins/Unity/CMakeLists.txt+1−2
@@ -47,6 +47,5 @@ target_link_libraries(Unity-qml
4747
4848qt5_use_modules(Unity-qml Qml)
4949
50−# export the qmldir qmltypes and plugin files
51−export_qmlfiles(Unity Unity)
50+# export the qmldir and qmltypes files
5251export_qmlplugin(Unity 0.1 Unity TARGETS Unity-qml)
plugins/Unity/Indicators/CMakeLists.txt+3−5
@@ -1,6 +1,3 @@
1−# export_qmlplugin macro
2−include(Plugins)
3−
41project(IndicatorsQml)
52
63pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
@@ -50,5 +47,6 @@ target_link_libraries(IndicatorsQml
5047
5148qt5_use_modules(IndicatorsQml Core Qml Quick)
5249
53−# export the qmltypes and plugin files
54−export_qmlplugin(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsQml)
50+install(TARGETS IndicatorsQml
51+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators
52+ )
plugins/Unity/Indicators/Messaging/qml/CMakeLists.txt+14−4
@@ -1,5 +1,15 @@
1−# export_qmlfiles macro
2−include(Plugins)
1+file(GLOB IndicatorsMessaging_QMLFILES
2+ *.qml
3+ *.js
4+ qmldir
5+)
36
4−# export the qmldir, *.qml files.
5−export_qmlfiles(Unity.Indicators.Messaging Unity/Indicators/Messaging)
7+# copy qml & qmldir files into build directory for shadow builds
8+add_custom_target(UnityIndicatorsMessagingQmlFiles ALL
9+ COMMAND cp ${IndicatorsMessaging_QMLFILES} ${CMAKE_BINARY_DIR}/plugins/Unity/Indicators/Messaging
10+ DEPENDS ${IndicatorsMessaging_QMLFILES}
11+)
12+
13+install(FILES ${IndicatorsMessaging_QMLFILES}
14+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators/Messaging
15+)
plugins/Unity/Indicators/Network/CMakeLists.txt+3−6
@@ -1,6 +1,3 @@
1−# export_qmlplugin macro
2−include(Plugins)
3−
41project(IndicatorsNetworkQml)
52
63pkg_check_modules(GLIB glib-2.0>=2.32)
@@ -35,9 +32,9 @@ if(LIBNM_GLIB_FOUND AND LIBNM_UTIL_FOUND AND GLIB_FOUND)
3532 ${LIBNM_UTIL_LIBRARIES}
3633 )
3734
38− # export the qmltypes and plugin files
39− export_qmlplugin(Unity.Indicators.Network 0.1 Unity/Indicators/Network TARGETS IndicatorsNetworkQml)
40−
35+ install(TARGETS IndicatorsNetworkQml
36+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators/Network
37+ )
4138else()
4239 message(WARNING "Missing glib or libnm dependency for the network plugin, not building")
4340endif()
plugins/Unity/Indicators/Network/qml/CMakeLists.txt+14−4
@@ -1,5 +1,15 @@
1−# export_qmlplugin macro
2−include(Plugins)
1+file(GLOB IndicatorsNetwork_QMLFILES
2+ *.qml
3+ *.js
4+ qmldir
5+)
36
4−# export the qmldir, *.qml files.
5−export_qmlfiles(Unity.Indicators.Network Unity/Indicators/Network)
7+# copy qml & qmldir files into build directory for shadow builds
8+add_custom_target(UnityIndicatorsNetworkQmlFiles ALL
9+ COMMAND cp ${IndicatorsNetwork_QMLFILES} ${CMAKE_BINARY_DIR}/plugins/Unity/Indicators/Network
10+ DEPENDS ${IndicatorsNetwork_QMLFILES}
11+)
12+
13+install(FILES ${IndicatorsNetwork_QMLFILES}
14+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators/Network
15+)
plugins/Unity/Indicators/Network/qml/qmldir−1
@@ -1,6 +1,5 @@
11module Unity.Indicators.Network
22plugin IndicatorsNetworkQml
3−typeinfo plugin.qmltypes
43
54NetworkPage 0.1 NetworkPage.qml
65AccessPoint 0.1 AccessPoint.qml
plugins/Unity/Indicators/qml/CMakeLists.txt+13−4
@@ -1,5 +1,14 @@
1−# export_qmlplugin macro
2−include(Plugins)
1+file(GLOB Indicators_QMLFILES
2+ *.qml
3+ qmldir
4+)
35
4−# export the qmldir, *.qml files.
5−export_qmlfiles(Unity.Indicators Unity/Indicators)
6+# copy qml & qmldir files into build directory for shadow builds
7+add_custom_target(UnityIndicatorsQmlFiles ALL
8+ COMMAND cp ${Indicators_QMLFILES} ${CMAKE_BINARY_DIR}/plugins/Unity/Indicators
9+ DEPENDS ${Indicators_QMLFILES}
10+)
11+
12+install(FILES ${Indicators_QMLFILES}
13+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators
14+)
plugins/Unity/Indicators/qml/qmldir−1
@@ -1,6 +1,5 @@
11module Unity.Indicators
22plugin IndicatorsQml
3−typeinfo plugin.qmltypes
43
54BasicMenuItem 0.1 BasicMenuItem.qml
65ButtonMenuItem 0.1 ButtonMenuItem.qml
plugins/Utils/CMakeLists.txt+1−2
@@ -23,6 +23,5 @@ set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
2323
2424qt5_use_modules(Utils-qml Qml Quick)
2525
26−# export the qmldir qmltypes and plugin files
27−export_qmlfiles(Utils Utils)
26+# export the qmldir and qmltypes files
2827export_qmlplugin(Utils 0.1 Utils TARGETS Utils-qml)