diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-02-16 11:38:14 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-02-16 11:38:14 +0100 |
| commit | adb447d7067f73db4040ad3119a2a52cd08879a2 (patch) | |
| tree | db992cb4cd4974e95c93833cf432eb6eea65fed2 | |
| parent | b439ad041ff4478453f0bd4e00f55224d653c69b (diff) | |
| parent | e4b6f9ac3aead714e654418044dea504cfa04474 (diff) | |
| download | ayatana-indicator-datetime-adb447d7067f73db4040ad3119a2a52cd08879a2.tar.gz ayatana-indicator-datetime-adb447d7067f73db4040ad3119a2a52cd08879a2.tar.bz2 ayatana-indicator-datetime-adb447d7067f73db4040ad3119a2a52cd08879a2.zip | |
Merge branch 'tari01-pr/cleanup-compile-flags'
Attributes GH PR #87: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/87
| -rw-r--r-- | .build.yml | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 22 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 |
4 files changed, 7 insertions, 26 deletions
@@ -226,7 +226,6 @@ before_scripts: build_scripts: - if [ ${DISTRO_NAME} == "debian" ];then - - export CFLAGS+=" -Wsign-compare -Wunused-parameter" - cppcheck --enable=warning,style,performance,portability,information --suppress=missingInclude . - fi - diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bb9042..ba6ebfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,8 +24,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() ## @@ -107,19 +112,6 @@ add_custom_target (cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2 ## Actual building ## -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() - - include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include) include_directories (${CMAKE_CURRENT_BINARY_DIR}/include) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5409c91..4131f22 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -54,13 +54,6 @@ if (ENABLE_LOMIRI_FEATURES) /usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml) endif() -# add warnings/coverage info on handwritten files -# but not the autogenerated ones... -set_source_files_properties(${SERVICE_CXX_SOURCES} - PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS}) -set_source_files_properties(${SERVICE_C_SOURCES} - PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS}) - # add the bin dir to our include path so our code can find the generated header files include_directories (${CMAKE_CURRENT_BINARY_DIR}) @@ -69,6 +62,5 @@ include_directories (${CMAKE_SOURCE_DIR}) link_directories (${SERVICE_DEPS_LIBRARY_DIRS}) add_executable (${SERVICE_EXEC} main.cpp) -set_source_files_properties(${SERVICE_SOURCES} main.cpp PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS}) target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES}) install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 247761f..4b9b1d7 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,7 +1,5 @@ find_package(GMock REQUIRED) -SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILE_FLAGS}") - # dbustest pkg_check_modules(DBUSTEST REQUIRED dbustest-1>=14.04.0) |