From 8ef6283bf4f5cf5d12131c48365a753825fea637 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 29 Dec 2020 14:10:38 +0100 Subject: [PATCH 1/3] added srv3 --- pus/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/pus/CMakeLists.txt b/pus/CMakeLists.txt index 758c2629..c0e00448 100644 --- a/pus/CMakeLists.txt +++ b/pus/CMakeLists.txt @@ -5,6 +5,7 @@ target_sources(${LIB_FSFW_NAME} Service17Test.cpp Service1TelecommandVerification.cpp Service2DeviceAccess.cpp + Service3Housekeeping.cpp Service5EventReporting.cpp Service8FunctionManagement.cpp Service9TimeManagement.cpp From 1ac2479b28c1114b0876123e0db4155abfbf06fe Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 29 Dec 2020 18:06:25 +0100 Subject: [PATCH 2/3] made warning flag optional --- CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02849ca4..aaf9a8af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,11 +110,18 @@ if(CMAKE_COMPILER_IS_GNUCXX) set(WARNING_FLAGS -Wall -Wextra - -Wshadow=local -Wimplicit-fallthrough=1 -Wno-unused-parameter -Wno-psabi ) + + if(NOT DEFINED WARNING_SHADOW_LOCAL) + option(WARNING_SHADOW_LOCAL "Show shadows declarations warning." ON) + endif() + + if(WARNING_SHADOW_LOCAL) + list(APPEND WARNING_FLAGS "-Wshadow=local") + endif() endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") From e0f8113eac7f4628cab072aa000a717572fa3336 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 19 Jan 2021 16:39:12 +0100 Subject: [PATCH 3/3] added missing endif --- CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9dbd24cb..e18e3ede 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,10 +119,11 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -Wno-unused-parameter -Wno-psabi ) - - if(FSFW_WARNING_SHADOW_LOCAL_GCC) - list(APPEND WARNING_FLAGS "-Wshadow=local") - endif() + endif() + + if(FSFW_WARNING_SHADOW_LOCAL_GCC) + list(APPEND WARNING_FLAGS "-Wshadow=local") + endif() endif()