Merge lp:~alan-griffiths/miral/identify-code-using-libmirserver-directly into lp:miral

[Alan Griffiths]

[miral-qt] Identify direct dependencies on mirserver-dev

[Gerry Boland (gerboland)]

+string(REPLACE ";" " " FIXME_MIRSERVER_CXXFLAGS "${MIRSERVER_CFLAGS}")
this line confused me, it just does a syntax switch for the set_source_files_properties call?

Rest looks ok, I look forward to eradicating these one by one. And I hope the features exported will be of use to other shells

review: Approve

[Gerry Boland (gerboland)]

Tests fixed, thanks

review: Approve

=== modified file 'miral-qt/CMakeLists.txt'
--- miral-qt/CMakeLists.txt	2016-09-23 15:56:53 +0000
+++ miral-qt/CMakeLists.txt	2016-10-27 07:31:06 +0000
@@ -78,6 +78,9 @@
 pkg_check_modules(MIRCLIENT mirclient>=0.22 REQUIRED)
 pkg_check_modules(MIRRENDERERGLDEV mir-renderer-gl-dev>=0.22 REQUIRED)
 
+# Reformat ${MIRSERVER_CFLAGS} to use with set_source_files_properties()
+string(REPLACE ";" " " FIXME_MIRSERVER_CXXFLAGS "${MIRSERVER_CFLAGS}")
+
 pkg_check_modules(XKBCOMMON xkbcommon REQUIRED)
 pkg_check_modules(GLIB glib-2.0 REQUIRED)
 pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)

=== modified file 'miral-qt/src/modules/Unity/Application/CMakeLists.txt'
--- miral-qt/src/modules/Unity/Application/CMakeLists.txt	2016-09-30 14:04:24 +0000
+++ miral-qt/src/modules/Unity/Application/CMakeLists.txt	2016-10-27 07:31:06 +0000
@@ -15,7 +15,6 @@
     ${GLIB_INCLUDE_DIRS}
     ${GIO_INCLUDE_DIRS}
     ${GIO_UNIX_INCLUDE_DIRS}
-    ${MIRSERVER_INCLUDE_DIRS}
     ${MIRRENDERERGLDEV_INCLUDE_DIRS}
     ${PROCESS_CPP_INCLUDE_DIRS}
     ${UBUNTU_PLATFORM_API_INCLUDE_DIRS}
@@ -73,6 +72,15 @@
     settings_interface.h
     )
 
+set_source_files_properties(application_manager.cpp PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${FIXME_MIRSERVER_CXXFLAGS}")
+# SurfaceObserver unecessarily uses public inheritance from mir::scene::SurfaceObserver
+set_source_files_properties(mirsurface.cpp          PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${FIXME_MIRSERVER_CXXFLAGS}")
+set_source_files_properties(mirbuffersgtexture.cpp  PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${FIXME_MIRSERVER_CXXFLAGS}")
+set_source_files_properties(session.cpp             PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${FIXME_MIRSERVER_CXXFLAGS}")
+set_source_files_properties(sessionmanager.cpp      PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${FIXME_MIRSERVER_CXXFLAGS}")
+set_source_files_properties(toplevelwindowmodel.cpp PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${FIXME_MIRSERVER_CXXFLAGS}")
+set_source_files_properties(windowmodel.cpp         PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${FIXME_MIRSERVER_CXXFLAGS}")
+
 add_library(unityapplicationplugin SHARED
     ${QMLMIRPLUGIN_SRC}
 )

=== modified file 'miral-qt/src/modules/Unity/Screens/CMakeLists.txt'
--- miral-qt/src/modules/Unity/Screens/CMakeLists.txt	2016-09-15 21:11:15 +0000
+++ miral-qt/src/modules/Unity/Screens/CMakeLists.txt	2016-10-27 07:31:06 +0000
@@ -6,7 +6,6 @@
     SYSTEM
     ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
     ${Qt5Quick_INCLUDE_DIRS}
-    ${MIRSERVER_INCLUDE_DIRS}
     )
 
 set(SCREENSPLUGIN_SRC
@@ -15,6 +14,10 @@
     qquickscreenwindow.cpp
     )
 
+# screens.h references mir/graphics/display_configuration.h
+set_source_files_properties(screens.cpp             PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${FIXME_MIRSERVER_CXXFLAGS}")
+set_source_files_properties(qquickscreenwindow.cpp  PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${FIXME_MIRSERVER_CXXFLAGS}")
+
 add_library(unityscreensplugin SHARED
     ${SCREENSPLUGIN_SRC}
 )

=== modified file 'miral-qt/src/platforms/mirserver/CMakeLists.txt'
--- miral-qt/src/platforms/mirserver/CMakeLists.txt	2016-10-06 11:57:16 +0000
+++ miral-qt/src/platforms/mirserver/CMakeLists.txt	2016-10-27 07:31:06 +0000
@@ -30,7 +30,6 @@
 include_directories(
     SYSTEM
     ${MIRCOMMON_INCLUDE_DIRS}
-    ${MIRSERVER_INCLUDE_DIRS}
     ${MIRRENDERERGLDEV_INCLUDE_DIRS}
 
     ${URL_DISPATCHER_INCLUDE_DIRS}
@@ -52,53 +51,61 @@
 # Needed to compile tracepoints in C99 mode.
 add_definitions(-DBYTE_ORDER=__BYTE_ORDER)
 
-set(MIRSERVER_QPA_PLUGIN_SRC
-    ${MIRAL_QT_SOURCE_DIR}/src/common/debughelpers.cpp
+# These files will compile without mirserver-dev
+add_library(qpa-mirserver-nomirserver OBJECT
     ${MIRAL_QT_SOURCE_DIR}/src/common/timestamp.cpp
-    cursor.cpp
-    eventbuilder.cpp
     logging.cpp
+    plugin.cpp
+    shelluuid.cpp
+    ubuntutheme.cpp
+    clipboard.cpp
+    openglcontextfactory.cpp openglcontextfactory.h
     mircursorimages.cpp
     mirdisplayconfigurationpolicy.cpp
     mirsingleton.cpp
-    qteventfeeder.cpp
-    plugin.cpp
-    qmirserver.cpp
-    qmirserver_p.cpp
     sessionauthorizer.cpp
-    shelluuid.cpp
-    surfaceobserver.cpp
     promptsessionlistener.cpp
     mirserverstatuslistener.cpp
-    screen.cpp
-    screenwindow.cpp
     screenscontroller.cpp
-    screensmodel.cpp
-    mirserverintegration.cpp
-    miropenglcontext.cpp
     nativeinterface.cpp
-    offscreensurface.cpp
     qtcompositor.cpp
     services.cpp
-    ubuntutheme.cpp
-    clipboard.cpp
     windowcontroller.cpp
     windowmanagementpolicy.cpp
-    tracepoints.c
     mirserverhooks.cpp mirserverhooks.h
-    openglcontextfactory.cpp openglcontextfactory.h
-    promptsessionmanager.cpp promptsessionmanager.h promptsession.h
     setqtcompositor.cpp setqtcompositor.h
 # We need to run moc on these headers
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h
-    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h
     ${MIRAL_QT_SOURCE_DIR}/src/common/appnotifier.h
     ${MIRAL_QT_SOURCE_DIR}/src/common/windowcontrollerinterface.h
     ${MIRAL_QT_SOURCE_DIR}/src/common/windowmodelnotifier.h
 )
 
+include_directories(SYSTEM ${MIRSERVER_INCLUDE_DIRS})
+
+set(MIRSERVER_QPA_PLUGIN_SRC
+    ${MIRAL_QT_SOURCE_DIR}/src/common/debughelpers.cpp
+    cursor.cpp
+    eventbuilder.cpp
+    qteventfeeder.cpp
+    qmirserver.cpp
+    qmirserver_p.cpp
+    surfaceobserver.cpp
+    screen.cpp
+    screenwindow.cpp
+    screensmodel.cpp
+    mirserverintegration.cpp
+    miropenglcontext.cpp
+    offscreensurface.cpp
+    tracepoints.c
+    promptsessionmanager.cpp promptsessionmanager.h promptsession.h
+# We need to run moc on these headers
+    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h
+)
+
 add_library(qpa-mirserver SHARED
     ${MIRSERVER_QPA_PLUGIN_SRC}
+    $<TARGET_OBJECTS:qpa-mirserver-nomirserver>
 )
 
 target_link_libraries(