diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-01-27 15:12:55 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-01-27 15:12:55 +0100 |
| commit | f57b15b8be5f9062fd57f420ad88446956aa9e82 (patch) | |
| tree | 5f6c0e35a2a23daa7bf8a1b8a5e0027dbd6e63db /CMakeLists.txt | |
| parent | 6c32528d631e7a002a8a4f0a4574a662079c0b0f (diff) | |
| parent | 7ba756aa76ad0d1d645f904cac54d0f6cefe67d0 (diff) | |
| download | ayatana-indicator-display-f57b15b8be5f9062fd57f420ad88446956aa9e82.tar.gz ayatana-indicator-display-f57b15b8be5f9062fd57f420ad88446956aa9e82.tar.bz2 ayatana-indicator-display-f57b15b8be5f9062fd57f420ad88446956aa9e82.zip | |
Merge branch 'tari01-pr/cleanup-compile-flags'
Attributes GH PR #48: https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/48
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d5ca89..63b4d29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,8 +29,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") +elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + add_definitions("-Wall") endif() set(CMAKE_INSTALL_PKGLIBEXECDIR "${CMAKE_INSTALL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}") @@ -79,15 +84,7 @@ include_directories (SYSTEM ## include_directories(${CMAKE_CURRENT_SOURCE_DIR}) - -# set the compiler warnings -if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - list(APPEND CXX_WARNING_ARGS -Weverything -Wno-c++98-compat -Wno-padded) -elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - list(APPEND CXX_WARNING_ARGS -Wall -Wextra -Wpedantic) -endif() - -add_compile_options(-std=c++14 -fPIC) +add_compile_options(-fPIC) add_subdirectory(src) add_subdirectory(data) |