summaryrefslogtreecommitdiff
diff options
authorMartin Pitt <martin.pitt@canonical.com>2016-10-26 23:19:33 +0200
committerMartin Pitt <martin.pitt@canonical.com>2016-10-26 23:19:33 +0200
commit977e618c693419cb11145c9d02e9542b5254c69e (patch)
tree0ae613abcdbab675632353b4bbf8abcb5e76a76d
parenta9418611d57dc618390f9d85632d3ac1803bf78c (diff)
Disable fatal deprecation warnings
Gtk 3.22 deprecated GdkScreen in favor of GdkMonitor. This is quite intrusive to port and would prevent being able to build unity on Ubuntu 16.04 or 16.10. Using deprecated symbols is not an error, so disable build failures due to them. (bzr r4194.2.1)
-rw-r--r--CMakeLists.txt2
-rw-r--r--services/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90c5998b4..1c5f7e3f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -209,7 +209,7 @@ if (BOOT_LOGGER)
SET (BOOT_LOGGER_FLAG "-DENABLE_LOGGER")
endif (BOOT_LOGGER)
-SET (MAINTAINER_CXXFLAGS "-Werror -Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds")
+SET (MAINTAINER_CXXFLAGS "-Werror -Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wno-error=deprecated-declarations")
option (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS "Disable errors when local typedefs are unused" ON)
if (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
index de866c108..9a9f9e01f 100644
--- a/services/CMakeLists.txt
+++ b/services/CMakeLists.txt
@@ -35,7 +35,7 @@ set(PANEL_SOURCES
set(CFLAGS
${SERVICE_DEPS_CFLAGS}
${SERVICE_DEPS_CFLAGS_OTHER}
- "-Werror -Wall"
+ "-Werror -Wall -Wno-error=deprecated-declarations"
)
string (REPLACE ";" " " CFLAGS "${CFLAGS}")