Moved Network/Messaging qml to respective Indicator subfolders. CMake shadow builds use custom target for copying qml files.
commitdb20921cd5f2f15b66095a54c04a559297483fd0
authorNick Dedekind <nicholas.dedekind@gmail.com>
dateFri 28 Jun 2013, 11:54 (13 years ago)
parent3623cdc
modules/Unity/Indicators/CMakeLists.txt+1
@@ -6,6 +6,7 @@ find_package(Qt5Core REQUIRED)
66find_package(Qt5Quick REQUIRED)
77
88add_subdirectory(qml)
9+add_subdirectory(Messaging)
910add_subdirectory(Network)
1011
1112include_directories(
modules/Unity/Indicators/Messaging/CMakeLists.txtnew file+1
@@ -0,0 +1 @@
1+add_subdirectory(qml)
modules/Unity/Indicators/qml/messaging/ActionButton.qml → modules/Unity/Indicators/Messaging/qml/ActionButton.qmlrenamed
The content is the same.
modules/Unity/Indicators/qml/messaging/ActionTextField.qml → modules/Unity/Indicators/Messaging/qml/ActionTextField.qmlrenamed
The content is the same.
modules/Unity/Indicators/Messaging/qml/CMakeLists.txtnew file+15
@@ -0,0 +1,15 @@
1+file(GLOB IndicatorsMessaging_QMLFILES
2+ *.qml
3+ *.js
4+ qmldir
5+)
6+
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}/modules/Unity/Indicators/Messaging
10+ DEPENDS ${IndicatorsMessaging_QMLFILES}
11+)
12+
13+install(FILES ${IndicatorsMessaging_QMLFILES}
14+ DESTINATION ${SHELL_APP_DIR}/modules/Unity/Indicators/Messaging
15+)
modules/Unity/Indicators/qml/messaging/GroupedMessage.qml → modules/Unity/Indicators/Messaging/qml/GroupedMessage.qmlrenamed
The content is the same.
modules/Unity/Indicators/qml/messaging/HeroMessage.qml → modules/Unity/Indicators/Messaging/qml/HeroMessage.qmlrenamed
The content is the same.
modules/Unity/Indicators/qml/messaging/HeroMessageHeader.qml → modules/Unity/Indicators/Messaging/qml/HeroMessageHeader.qmlrenamed
The content is the same.
modules/Unity/Indicators/qml/messaging/MessageMenuItem.qml → modules/Unity/Indicators/Messaging/qml/MessageMenuItem.qmlrenamed
The content is the same.
modules/Unity/Indicators/qml/messaging/QuickReply.qml → modules/Unity/Indicators/Messaging/qml/QuickReply.qmlrenamed
The content is the same.
modules/Unity/Indicators/qml/messaging/SimpleTextMessage.qml → modules/Unity/Indicators/Messaging/qml/SimpleTextMessage.qmlrenamed
The content is the same.
modules/Unity/Indicators/qml/messaging/SnapDecision.qml → modules/Unity/Indicators/Messaging/qml/SnapDecision.qmlrenamed
The content is the same.
modules/Unity/Indicators/qml/messaging/TextMessage.qml → modules/Unity/Indicators/Messaging/qml/TextMessage.qmlrenamed
The content is the same.
modules/Unity/Indicators/qml/messaging/qmldir → modules/Unity/Indicators/Messaging/qml/qmldirrenamed
The content is the same.
modules/Unity/Indicators/qml/messaging/utils.js → modules/Unity/Indicators/Messaging/qml/utils.jsrenamed
The content is the same.
modules/Unity/Indicators/Network/CMakeLists.txt+2
@@ -35,3 +35,5 @@ if(LIBNM_GLIB_FOUND AND LIBNM_UTIL_FOUND AND GLIB_FOUND)
3535else()
3636 message(WARNING "Missing glib or libnm dependency for the network plugin, not building")
3737endif()
38+
39+add_subdirectory(qml)
modules/Unity/Indicators/qml/network/AccessPoint.qml → modules/Unity/Indicators/Network/qml/AccessPoint.qmlrenamed
The content is the same.
modules/Unity/Indicators/Network/qml/CMakeLists.txtnew file+15
@@ -0,0 +1,15 @@
1+file(GLOB IndicatorsNetwork_QMLFILES
2+ *.qml
3+ *.js
4+ qmldir
5+)
6+
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}/modules/Unity/Indicators/Network
10+ DEPENDS ${IndicatorsNetwork_QMLFILES}
11+)
12+
13+install(FILES ${IndicatorsNetwork_QMLFILES}
14+ DESTINATION ${SHELL_APP_DIR}/modules/Unity/Indicators/Network
15+)
modules/Unity/Indicators/qml/network/PasswordPage.qml → modules/Unity/Indicators/Network/qml/PasswordPage.qmlrenamed
The content is the same.
modules/Unity/Indicators/qml/network/WifiSection.qml → modules/Unity/Indicators/Network/qml/WifiSection.qmlrenamed
The content is the same.
modules/Unity/Indicators/qml/network/qmldir → modules/Unity/Indicators/Network/qml/qmldirrenamed
The content is the same.
modules/Unity/Indicators/qml/CMakeLists.txt+5−15
@@ -1,24 +1,14 @@
11file(GLOB Indicators_QMLFILES
22 *.qml
3+ qmldir
34)
45
5−# copy qmldir file into build directory for shadow builds
6−file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
7− DESTINATION ${CMAKE_BINARY_DIR}/modules/Unity/Indicators
8−)
9−
10−# copy qmldir file into build directory for shadow builds
11−file(COPY ${Indicators_QMLFILES}
12− DESTINATION ${CMAKE_BINARY_DIR}/modules/Unity/Indicators
13−)
14−
15−install(FILES qmldir
16− DESTINATION ${SHELL_APP_DIR}/modules/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}/modules/Unity/Indicators
9+ DEPENDS ${Indicators_QMLFILES}
1710)
1811
1912install(FILES ${Indicators_QMLFILES}
2013 DESTINATION ${SHELL_APP_DIR}/modules/Unity/Indicators
2114)
22−
23−add_subdirectory(messaging)
24−add_subdirectory(network)
modules/Unity/Indicators/qml/messaging/CMakeLists.txtdeleted−22
@@ -1,22 +0,0 @@
1−file(GLOB IndicatorsMessaging_QMLFILES
2− *.qml
3− *.js
4−)
5−
6−# copy qmldir file into build directory for shadow builds
7−file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
8− DESTINATION ${CMAKE_BINARY_DIR}/modules/Unity/Indicators/Messaging
9−)
10−
11−# copy qmldir file into build directory for shadow builds
12−file(COPY ${IndicatorsMessaging_QMLFILES}
13− DESTINATION ${CMAKE_BINARY_DIR}/modules/Unity/Indicators/Messaging
14−)
15−
16−install(FILES qmldir
17− DESTINATION ${SHELL_APP_DIR}/modules/Unity/Indicators/Messaging
18−)
19−
20−install(FILES ${IndicatorsMessaging_QMLFILES}
21− DESTINATION ${SHELL_APP_DIR}/modules/Unity/Indicators/Messaging
22−)
modules/Unity/Indicators/qml/network/CMakeLists.txtdeleted−21
@@ -1,21 +0,0 @@
1−file(GLOB IndicatorsNetwork_QMLFILES
2− *.qml
3−)
4−
5−# copy qmldir file into build directory for shadow builds
6−file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
7− DESTINATION ${CMAKE_BINARY_DIR}/modules/Unity/Indicators/Network
8−)
9−
10−# copy qmldir file into build directory for shadow builds
11−file(COPY ${IndicatorsNetwork_QMLFILES}
12− DESTINATION ${CMAKE_BINARY_DIR}/modules/Unity/Indicators/Network
13−)
14−
15−install(FILES qmldir
16− DESTINATION ${SHELL_APP_DIR}/modules/Unity/Indicators/Network
17−)
18−
19−install(FILES ${IndicatorsNetwork_QMLFILES}
20− DESTINATION ${SHELL_APP_DIR}/modules/Unity/Indicators/Network
21−)