aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2022-02-18 08:23:34 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2022-02-18 08:23:34 +0100
commit4d324593cd1af2c11fab2b0b85f9dc6bffc649e9 (patch)
tree0db0418e38ff549cac2a3dfe858fc3af2e34b0af
parentbe9c06cecaa710f53a538b8975de72332904c1ca (diff)
parentf12504a479fb0884f2022414772dde3a4b5aa9df (diff)
downloadayatana-indicator-sound-4d324593cd1af2c11fab2b0b85f9dc6bffc649e9.tar.gz
ayatana-indicator-sound-4d324593cd1af2c11fab2b0b85f9dc6bffc649e9.tar.bz2
ayatana-indicator-sound-4d324593cd1af2c11fab2b0b85f9dc6bffc649e9.zip
Merge branch 'tari01-pr/cleanup-compile-flags'
Attributes GH PR #76: https://github.com/AyatanaIndicators/ayatana-indicator-sound/pull/76
-rw-r--r--.build.yml1
-rw-r--r--CMakeLists.txt16
-rw-r--r--tests/service-mocks/media-player-mpris-mock/CMakeLists.txt3
3 files changed, 8 insertions, 12 deletions
diff --git a/.build.yml b/.build.yml
index aa6e250..cbbed1a 100644
--- a/.build.yml
+++ b/.build.yml
@@ -267,7 +267,6 @@ before_scripts:
build_scripts:
- if [ ${DISTRO_NAME} == "debian" ];then
- - export CFLAGS+=" -Wsign-compare -Wunused-parameter"
- cppcheck --enable=warning,style,performance,portability,information,missingInclude --inline-suppr --library=qt --suppress=missingInclude .
- fi
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4618aa..9c3dfa4 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()
set(GETTEXT_PACKAGE "ayatana-indicator-sound")
@@ -82,13 +87,6 @@ find_package(GObjectIntrospection 0.9.12)
include_directories(${SOURCE_DIR})
include_directories(${SOURCE_BINARY_DIR})
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
-add_definitions(
- -Wall
-)
-
configure_file(
"config.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/config.h"
diff --git a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt
index abe109e..27302f0 100644
--- a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt
+++ b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt
@@ -1,8 +1,7 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -fPIC -pthread")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -fno-strict-aliasing -Wextra -fPIC -pthread")
+add_definitions("-fPIC")
find_package(Qt5DBus REQUIRED)
include_directories(${Qt5DBus_INCLUDE_DIRS}