diff options
| author | Alberto Aguirre <alberto.aguirre@canonical.com> | 2015-08-11 14:25:04 -0500 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-08-26 11:43:45 +0000 |
| commit | 9325a56e1aa8e12e2fa6a7432fae8adb7f67afba (patch) | |
| tree | bf912a3d614795e4de81444307e612ade4caafbd | |
| parent | cba4a842e5a2d24ffd52f0dd639906e7c125850f (diff) | |
No more protobuf - it is not used anymore.
Change-Id: Ib9667eb6f3b53a6096fc44533e62102a08e7963d
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | src/platforms/mirserver/CMakeLists.txt | 2 |
3 files changed, 0 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8555ffa..3fccd14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,11 +60,6 @@ find_package(Qt5Test 5.4 REQUIRED) find_package(Threads REQUIRED) -find_package(Protobuf REQUIRED) -if(PROTOBUF_PROTOC_EXECUTABLE STREQUAL "PROTOBUF_PROTOC_EXECUTABLE-NOTFOUND") - message(SEND_ERROR "protoc executable not found! Missing protobuf-compiler package?") -endif() - pkg_check_modules(MIRSERVER mirserver>=0.14 REQUIRED) pkg_check_modules(MIRCLIENT mirclient>=0.14 REQUIRED) @@ -72,7 +67,6 @@ pkg_check_modules(GLIB glib-2.0 REQUIRED) pkg_check_modules(PROCESS_CPP process-cpp REQUIRED) pkg_check_modules(UBUNTU_APP_LAUNCH ubuntu-app-launch-2 REQUIRED) pkg_check_modules(URL_DISPATCHER url-dispatcher-1) -pkg_check_modules(PROTOBUF protobuf) pkg_check_modules(EGL egl) pkg_check_modules(GIO gio-2.0) pkg_check_modules(GIO_UNIX gio-unix-2.0) diff --git a/debian/control b/debian/control index cf63849..698bd47 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,6 @@ Build-Depends: cmake, libxkbcommon-dev, libxrender-dev, pkg-config, - protobuf-compiler, # lttng-gen-ts needs python3, but doesn't depend on it itself: bug 1359147 python3:any, qt5-default, diff --git a/src/platforms/mirserver/CMakeLists.txt b/src/platforms/mirserver/CMakeLists.txt index 36d9321..b8d02f6 100644 --- a/src/platforms/mirserver/CMakeLists.txt +++ b/src/platforms/mirserver/CMakeLists.txt @@ -24,7 +24,6 @@ include_directories( ${MIRSERVER_INCLUDE_DIRS} ${URL_DISPATCHER_INCLUDE_DIRS} - ${PROTOBUF_INCLUDE_DIRS} ${EGL_INCLUDE_DIRS} ${LTTNG_INCLUDE_DIRS} @@ -76,7 +75,6 @@ target_link_libraries( ${MIRSERVER_LDFLAGS} ${MIRCLIENT_LDFLAGS} ${URL_DISPATCHER_LDFLAGS} - ${PROTOBUF_LDFLAGS} ${EGL_LDFLAGS} ${GL_LIBRARIES} ${LTTNG_LIBRARIES} |