aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2022-01-11 16:21:40 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2022-01-27 09:21:11 +0100
commita9b2be7a5ea5f45648faaf12c7b1acf19fa1ad9b (patch)
treee7f062021b6ad4f9557a1c270e5d5dc0ade86c3d /CMakeLists.txt
parentc4846f0938ff544b536fd06becab46bd9ce3dc1c (diff)
downloadayatana-indicator-keyboard-a9b2be7a5ea5f45648faaf12c7b1acf19fa1ad9b.tar.gz
ayatana-indicator-keyboard-a9b2be7a5ea5f45648faaf12c7b1acf19fa1ad9b.tar.bz2
ayatana-indicator-keyboard-a9b2be7a5ea5f45648faaf12c7b1acf19fa1ad9b.zip
Clean up compilation flags
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt22
1 files changed, 7 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7af496b6..7185445b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,8 +22,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
@@ -49,21 +54,8 @@ add_custom_target (dist COMMAND bzr export --root=${ARCHIVE_NAME} ${CMAKE_BINARY
add_custom_target (cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2 --inline-suppr ${CMAKE_SOURCE_DIR}/src)
# Actual building
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-
- set(C_WARNING_ARGS "${C_WARNING_ARGS} -Weverything")
- set(C_WARNING_ARGS "${C_WARNING_ARGS} -Wno-c++98-compat -Wno-padded")
- set(C_WARNING_ARGS "${C_WARNING_ARGS} -Wno-documentation")
-
-else()
-
- set(C_WARNING_ARGS "${C_WARNING_ARGS} -Wall")
-
-endif()
-
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
include_directories (${CMAKE_CURRENT_BINARY_DIR}/include)
-
add_subdirectory(src)
add_subdirectory(data)
add_subdirectory(po)