git.iko.soy/unity8
on xenial help sign in
Some various cleanups and code moves
5f45971Michael Terry
CMakeLists.txt+11−9
compare with xenial
unifiedsplit
@@ -103,17 +103,18 @@ set(GREETER_APP unity8-greeter)
103set(shell_app_HDRS
103set(shell_app_HDRS
104 )
104 )
105
105
106−add_executable(${SHELL_APP}
106+set(COMMON_SRCS
107− ${shellapplication_MOC_SRCS}
108 ApplicationArguments.h
107 ApplicationArguments.h
109 main.cpp
108 main.cpp
110 MouseTouchAdaptor.cpp
109 MouseTouchAdaptor.cpp
111 )
110 )
111+add_executable(${SHELL_APP}
112+ ${shellapplication_MOC_SRCS}
113+ ${COMMON_SRCS}
114+ )
112add_executable(${GREETER_APP}
115add_executable(${GREETER_APP}
113 ${greeterapplication_MOC_SRCS}
116 ${greeterapplication_MOC_SRCS}
114− ApplicationArguments.h
117+ ${COMMON_SRCS}
115− main.cpp
116− MouseTouchAdaptor.cpp
117 )
118 )
118
119
119set_target_properties(${SHELL_APP} PROPERTIES
120set_target_properties(${SHELL_APP} PROPERTIES
@@ -131,16 +132,17 @@ if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
131 set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
132 set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
132endif()
133endif()
133
134
134−target_link_libraries(${SHELL_APP}
135+set(COMMON_LIBS
135 ${Qt5Qml_LIBRARIES}
136 ${Qt5Qml_LIBRARIES}
136 ${Qt5Quick_LIBRARIES}
137 ${Qt5Quick_LIBRARIES}
137 ${XCB_LDFLAGS}
138 ${XCB_LDFLAGS}
138 ${CMAKE_DL_LIBS}
139 ${CMAKE_DL_LIBS}
139 )
140 )
141+target_link_libraries(${SHELL_APP}
142+ ${COMMON_LIBS}
143+ )
140target_link_libraries(${GREETER_APP}
144target_link_libraries(${GREETER_APP}
141− ${Qt5Qml_LIBRARIES}
145+ ${COMMON_LIBS}
142− ${Qt5Quick_LIBRARIES}
143− ${XCB_LDFLAGS}
144 )
146 )
145
147
146# install binaries
148# install binaries
GreeterShell.qml+2
@@ -202,6 +202,7 @@ BasicShell {
202 }
202 }
203 }
203 }
204
204
205+/*
205 Connections {
206 Connections {
206 target: applicationManager
207 target: applicationManager
207 ignoreUnknownSignals: true
208 ignoreUnknownSignals: true
@@ -213,6 +214,7 @@ BasicShell {
213 onMainStageFocusedApplicationChanged: greeter.hide()
214 onMainStageFocusedApplicationChanged: greeter.hide()
214 onSideStageFocusedApplicationChanged: greeter.hide()
215 onSideStageFocusedApplicationChanged: greeter.hide()
215 }
216 }
217+*/
216
218
217 GreeterEdgeDemo {
219 GreeterEdgeDemo {
218 id: edgeDemo
220 id: edgeDemo