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 | |
| 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
| -rw-r--r-- | .build.yml | 5 | ||||
| -rw-r--r-- | CMakeLists.txt | 19 | ||||
| -rw-r--r-- | tests/integration/usb-manager-test.cpp | 4 |
3 files changed, 13 insertions, 15 deletions
@@ -142,15 +142,14 @@ before_scripts: build_scripts: - if [ ${DISTRO_NAME} == "debian" ];then - - export CFLAGS+=" -Wsign-compare -Wunused-parameter" - cppcheck --enable=warning,style,performance,portability,information,missingInclude . - fi - - if [ -e ./CMakeLists.txt ]; then - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ];then - - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON + - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON -DENABLE_TESTS=ON - else - - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON + - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON - fi - else - exit 1 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) diff --git a/tests/integration/usb-manager-test.cpp b/tests/integration/usb-manager-test.cpp index 392fe19..6243e92 100644 --- a/tests/integration/usb-manager-test.cpp +++ b/tests/integration/usb-manager-test.cpp @@ -1,5 +1,6 @@ /* * Copyright 2016 Canonical Ltd. + * Copyright 2022 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr <charles.kerr@canonical.com> + * Robert Tari <robert@tari.in> */ #include <tests/utils/adbd-server.h> @@ -203,7 +205,7 @@ TEST_F(UsbManagerFixture, USBDisconnectedDuringPrompt) notificationsSpy.clear(); } - EXPECT_TRUE(wait_for([adbd_server, N_TESTS](){return adbd_server->m_responses.size() == N_TESTS;}, 5000)); + EXPECT_TRUE(wait_for([adbd_server](){return adbd_server->m_responses.size() == N_TESTS;}, 5000)); EXPECT_EQ(expected_responses, adbd_server->m_responses); } |