small fix

Merge branch 'eive/develop' into eive/shadow-local-warning
added missing endif
2021-01-19 16:42:18 +01:00 · 2021-01-19 16:39:23 +01:00 · 2021-01-19 16:39:12 +01:00 · 2021-01-19 16:33:20 +01:00 · 2021-01-19 16:33:01 +01:00 · 2021-01-19 16:32:36 +01:00
1 changed files with 5 additions and 7 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,8 +45,6 @@ endif()

 message(STATUS "Compiling FSFW for the ${OS_FSFW_NAME} operating system.")

-
-
 add_subdirectory(action)
 add_subdirectory(container)
 add_subdirectory(controller)
@@ -114,15 +112,15 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 	   set(FSFW_WARNING_FLAGS
 		  -Wall
 		  -Wextra
-		  -Wshadow=local
 		  -Wimplicit-fallthrough=1
 		  -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()
Author	SHA1	Message	Date
Robin Mueller	50733e223a	small fix	2021-01-19 16:42:18 +01:00
Robin Mueller	6a5f5af233	Merge branch 'eive/develop' into eive/shadow-local-warning	2021-01-19 16:39:23 +01:00
Robin Mueller	e0f8113eac	added missing endif	2021-01-19 16:39:12 +01:00
Robin Mueller	94d1b5acae	Merge branch 'eive/shadow-local-warning' of https://egit.irs.uni-stuttgart.de/eive/fsfw into eive/shadow-local-warning	2021-01-19 16:33:20 +01:00
Robin Mueller	2e9a855181	updating cmakelists	2021-01-19 16:33:01 +01:00
Robin Müller	fd5252bb57	Merge branch 'development' into eive/shadow-local-warning	2021-01-19 16:32:36 +01:00