on xenial help sign in
Some various cleanups and code moves
commit5f459718138b45596902813074b4d75beb116307 authorMichael Terry <michael.terry@canonical.com> dateWed 30 Oct 2013, 10:00 (13 years ago) parent8884c58
2 files changed+13−9
CMakeLists.txt+11−9 GreeterShell.qml+2
CMakeLists.txt+11−9
@@ -103,17 +103,18 @@ set(GREETER_APP unity8-greeter)
103103set(shell_app_HDRS
104104 )
105105
106−add_executable(${SHELL_APP}
107− ${shellapplication_MOC_SRCS}
106+set(COMMON_SRCS
108107 ApplicationArguments.h
109108 main.cpp
110109 MouseTouchAdaptor.cpp
111110 )
111+add_executable(${SHELL_APP}
112+ ${shellapplication_MOC_SRCS}
113+ ${COMMON_SRCS}
114+ )
112115add_executable(${GREETER_APP}
113116 ${greeterapplication_MOC_SRCS}
114− ApplicationArguments.h
115− main.cpp
116− MouseTouchAdaptor.cpp
117+ ${COMMON_SRCS}
117118 )
118119
119120set_target_properties(${SHELL_APP} PROPERTIES
@@ -131,16 +132,17 @@ if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
131132 set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
132133endif()
133134
134−target_link_libraries(${SHELL_APP}
135+set(COMMON_LIBS
135136 ${Qt5Qml_LIBRARIES}
136137 ${Qt5Quick_LIBRARIES}
137138 ${XCB_LDFLAGS}
138139 ${CMAKE_DL_LIBS}
139140 )
141+target_link_libraries(${SHELL_APP}
142+ ${COMMON_LIBS}
143+ )
140144target_link_libraries(${GREETER_APP}
141− ${Qt5Qml_LIBRARIES}
142− ${Qt5Quick_LIBRARIES}
143− ${XCB_LDFLAGS}
145+ ${COMMON_LIBS}
144146 )
145147
146148# install binaries
GreeterShell.qml+2
@@ -202,6 +202,7 @@ BasicShell {
202202 }
203203 }
204204
205+/*
205206 Connections {
206207 target: applicationManager
207208 ignoreUnknownSignals: true
@@ -213,6 +214,7 @@ BasicShell {
213214 onMainStageFocusedApplicationChanged: greeter.hide()
214215 onSideStageFocusedApplicationChanged: greeter.hide()
215216 }
217+*/
216218
217219 GreeterEdgeDemo {
218220 id: edgeDemo