From 8f7d4d4e664798c9a543dd4a53f03f20cec658fd Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Thu, 17 Feb 2022 02:28:24 +0100
Subject: Clean up compilation flags

---
 CMakeLists.txt     | 21 +++++++--------------
 src/CMakeLists.txt |  2 --
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06b10a3..09f6d22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,8 +19,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()
 
 # Check for prerequisites
@@ -35,18 +40,6 @@ include(GNUInstallDirs)
 set(PROJECT_VERSION "0.8.91")
 set(PROJECT_NAME "ayatana-indicator-application")
 
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-
-    set(COMPILE_FLAGS "${COMPILE_FLAGS} -Weverything")
-    set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-c++98-compat -Wno-padded")
-    set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-documentation")
-
-else()
-
-    set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wall")
-
-endif()
-
 # Make everything
 
 add_subdirectory(data)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3220d0a..3918595 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -81,7 +81,6 @@ set(SOURCES
     indicator-application.c
 )
 
-set_source_files_properties(${SOURCES} PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
 add_library("ayatana-application" SHARED ${SOURCES})
 target_compile_definitions("ayatana-application" PUBLIC G_LOG_DOMAIN="Ayatana-Indicator-Application")
 target_include_directories("ayatana-application" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
@@ -102,7 +101,6 @@ set(SOURCES
     generate-id.c
 )
 
-set_source_files_properties(${SOURCES} PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
 add_executable("ayatana-indicator-application-service" ${SOURCES})
 target_compile_definitions("ayatana-indicator-application-service" PUBLIC DATADIR="${CMAKE_INSTALL_FULL_DATADIR}/ayatana-indicator-application")
 target_compile_definitions("ayatana-indicator-application-service" PUBLIC G_LOG_DOMAIN="ayatana-indicator-application-service")
-- 
cgit v1.2.3


From ef11732b871d63d70d58e4d397d8a4c42e81ab0c Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Thu, 17 Feb 2022 02:31:04 +0100
Subject: .build.yml: Drop extra compilation flags

---
 .build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.build.yml b/.build.yml
index acd3c25..d979d69 100644
--- a/.build.yml
+++ b/.build.yml
@@ -144,7 +144,6 @@ before_scripts:
 
 build_scripts:
   - if [ ${DISTRO_NAME} == "debian" ];then
-  -     export CFLAGS+=" -Wsign-compare -Wunused-parameter"
   -     cppcheck --enable=warning,style,performance,portability,information,missingInclude .
   - fi
   -
-- 
cgit v1.2.3