From 4b442de3f5fbb524dae7857dcc04afe020538f95 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Thu, 17 Feb 2022 16:01:23 +0100
Subject: Clean up compilation flags

---
 CMakeLists.txt | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a13569..b5370ec 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
@@ -45,14 +50,14 @@ set(DEPS
 )
 if (FLAVOUR_GTK3)
     set(DEPS
-	${DEPS}
-	gtk+-3.0>=3.24
+    ${DEPS}
+    gtk+-3.0>=3.24
     )
 endif()
 if (FLAVOUR_GTK2)
     set(DEPS
-	${DEPS}
-	gtk+-2.0>=2.18
+    ${DEPS}
+    gtk+-2.0>=2.18
     )
 endif()
 
@@ -81,18 +86,6 @@ set(API_VERSION "4")
 set(PROJECT_VERSION "0.9.0")
 set(PROJECT_NAME "libayatana-indicator")
 
-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(src)
-- 
cgit v1.2.3