diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-01-27 10:04:34 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-01-27 10:04:34 +0100 |
| commit | abbda6214d6030de108f30f7b9e9acc91c67954f (patch) | |
| tree | 971ff2e94d6f43081e041541c02856b74bc2a322 | |
| parent | 9ee70e789ad3dc4ba4003d0ae59bce72b36378f3 (diff) | |
| parent | 82f20e9bee0cd782311a1dd14dc373733f8066b1 (diff) | |
| download | libayatana-common-abbda6214d6030de108f30f7b9e9acc91c67954f.tar.gz libayatana-common-abbda6214d6030de108f30f7b9e9acc91c67954f.tar.bz2 libayatana-common-abbda6214d6030de108f30f7b9e9acc91c67954f.zip | |
Merge branch 'tari01-pr/cleanup-compile-flags'
Attributes GH PR #55: https://github.com/AyatanaIndicators/libayatana-common/pull/55
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/utils.h | 30 |
2 files changed, 22 insertions, 19 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) 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(); |