From fa1e4146c116c0b6a671669199d6401c9914c614 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Thu, 13 Jan 2022 15:29:23 +0100
Subject: src/utils.h: Fix build warnings

---
 src/utils.h | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/utils.h b/src/utils.h
index 59bf008..aaca08e 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2021 Marius Gripsgard <marius@ubports.com>
- * Copyright 2021 Robert Tari <robert@tari.in>
+ * Copyright 2021-2022 Robert Tari <robert@tari.in>
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -22,20 +22,20 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-static const char *DESKTOP_LOMIRI = "Lomiri";
-static const char *DESKTOP_UNITY = "Unity";
-static const char *DESKTOP_MATE = "MATE";
-static const char *DESKTOP_GNOME = "GNOME";
-static const char *DESKTOP_XFCE = "XFCE";
-static const char *DESKTOP_PANTHEON = "PANTHEON";
-static const char *DESKTOP_BUDGIE = "Budgie";
-static const char *SESSION_LOMIRI = "ubuntu-touch";
-static const char *SESSION_UNITY = NULL;
-static const char *SESSION_MATE = "mate";
-static const char *SESSION_GNOME = "gnome";
-static const char *SESSION_XFCE = "xfce";
-static const char *SESSION_PANTHEON = NULL;
-static const char *SESSION_BUDGIE = "budgie-desktop";
+static const char * const DESKTOP_LOMIRI = "Lomiri";
+static const char * const DESKTOP_UNITY = "Unity";
+static const char * const DESKTOP_MATE = "MATE";
+static const char * const DESKTOP_GNOME = "GNOME";
+static const char * const DESKTOP_XFCE = "XFCE";
+static const char * const DESKTOP_PANTHEON = "PANTHEON";
+static const char * const DESKTOP_BUDGIE = "Budgie";
+static const char * const SESSION_LOMIRI = "ubuntu-touch";
+static const char * const SESSION_UNITY = NULL;
+static const char * const SESSION_MATE = "mate";
+static const char * const SESSION_GNOME = "gnome";
+static const char * const SESSION_XFCE = "xfce";
+static const char * const SESSION_PANTHEON = NULL;
+static const char * const SESSION_BUDGIE = "budgie-desktop";
 
 gboolean ayatana_common_utils_is_lomiri();
 gboolean ayatana_common_utils_is_unity();
-- 
cgit v1.2.3


From 82f20e9bee0cd782311a1dd14dc373733f8066b1 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Thu, 13 Jan 2022 15:31:22 +0100
Subject: CMakeLists.txt: Clean up compilation flags

---
 CMakeLists.txt | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47cf270..4fdda11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,13 @@ else()
 endif()
 
 if(ENABLE_WERROR)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+    add_definitions("-Werror")
+endif()
+
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    add_definitions("-Weverything")
+else()
+    add_definitions("-Wall")
 endif()
 
 # GNU standard installation directories
@@ -61,8 +66,6 @@ include_directories (${DEPS_INCLUDE_DIRS})
 find_package (GObjectIntrospection QUIET)
 find_package (Vala QUIET)
 
-set(CC_WARNING_ARGS " -Wall -pedantic -Wextra -Wno-missing-field-initializers")
-
 add_subdirectory(src)
 add_subdirectory(data)
 add_subdirectory(po)
-- 
cgit v1.2.3