##// END OF EJS Templates
Few cosmetic changes and lowered optim to -O2...
jeandet -
r400:9d5e16586c2c 3.2.0.22 R3++ draft
parent child
Show More
@@ -1,4 +1,4
1 cmake_minimum_required (VERSION 2.6)
1 cmake_minimum_required (VERSION 3.6)
2 project (LFR_FSW)
2 project (LFR_FSW)
3
3
4 if(NOT CMAKE_BUILD_TYPE)
4 if(NOT CMAKE_BUILD_TYPE)
@@ -9,7 +9,10 set(LIB_GCOV_SOURCES
9 gcov-iov.h
9 gcov-iov.h
10 libgcov.c
10 libgcov.c
11 )
11 )
12
12 if(Coverage)
13 # add_definitions(-DGCOV_USE_EXIT)
14 add_definitions(-DGCOV_ENABLED)
15 endif()
13 add_library(gcov STATIC ${LIB_GCOV_SOURCES})
16 add_library(gcov STATIC ${LIB_GCOV_SOURCES})
14
17
15 add_custom_target(gcovr
18 add_custom_target(gcovr
@@ -475,8 +475,10 gcov_read_counter (void)
475
475
476 gcov_crc32 = crc32;
476 gcov_crc32 = crc32;
477
477
478 #ifdef GCOV_USE_EXIT
478 if (!gcov_list)
479 if (!gcov_list)
479 atexit (gcov_exit);
480 atexit (gcov_exit);
481 #endif
480
482
481 info->next = gcov_list;
483 info->next = gcov_list;
482 gcov_list = info;
484 gcov_list = info;
@@ -10,8 +10,8 option(fix-b2bst "Activate -mfix-b2bst s
10 option(Coverage "Enables code coverage" OFF)
10 option(Coverage "Enables code coverage" OFF)
11
11
12
12
13 set(CMAKE_C_FLAGS_RELEASE "-O3")
13 set(CMAKE_C_FLAGS_RELEASE "-O2")
14 set(CMAKE_C_FLAGS_DEBUG "-O3 -fno-inline")
14 set(CMAKE_C_FLAGS_DEBUG "-O2 -g -fno-inline")
15
15
16
16
17 if(fix-b2bst)
17 if(fix-b2bst)
@@ -1,4 +1,4
1 cmake_minimum_required (VERSION 2.6)
1 cmake_minimum_required (VERSION 3.6)
2 project (fsw)
2 project (fsw)
3
3
4 include(sparc-rtems)
4 include(sparc-rtems)
@@ -65,7 +65,7 option(FSW_Instrument_Scrubbing "Enable
65 set(SW_VERSION_N1 "3" CACHE STRING "Choose N1 FSW Version." FORCE)
65 set(SW_VERSION_N1 "3" CACHE STRING "Choose N1 FSW Version." FORCE)
66 set(SW_VERSION_N2 "2" CACHE STRING "Choose N2 FSW Version." FORCE)
66 set(SW_VERSION_N2 "2" CACHE STRING "Choose N2 FSW Version." FORCE)
67 set(SW_VERSION_N3 "0" CACHE STRING "Choose N3 FSW Version." FORCE)
67 set(SW_VERSION_N3 "0" CACHE STRING "Choose N3 FSW Version." FORCE)
68 set(SW_VERSION_N4 "21" CACHE STRING "Choose N4 FSW Version." FORCE)
68 set(SW_VERSION_N4 "22" CACHE STRING "Choose N4 FSW Version." FORCE)
69
69
70 if(FSW_verbose)
70 if(FSW_verbose)
71 add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)
71 add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)
@@ -126,5 +126,5 if(NOT FSW_lpp_dpu_destid)
126 endif()
126 endif()
127
127
128
128
129 add_test_cppcheck(fsw STYLE UNUSED_FUNCTIONS POSSIBLE_ERROR MISSING_INCLUDE)
129 #add_test_cppcheck(fsw STYLE UNUSED_FUNCTIONS POSSIBLE_ERROR MISSING_INCLUDE)
130
130
@@ -179,6 +179,12 int action_reset(ccsdsTelecommandPacket_
179 */
179 */
180
180
181 PRINTF("this is the end!!!\n");
181 PRINTF("this is the end!!!\n");
182 #ifdef GCOV_ENABLED
183 #ifndef GCOV_USE_EXIT
184 extern void gcov_exit (void);
185 gcov_exit();
186 #endif
187 #endif
182 exit(0);
188 exit(0);
183
189
184 send_tm_lfr_tc_exe_not_implemented( TC, queue_id, time );
190 send_tm_lfr_tc_exe_not_implemented( TC, queue_id, time );
General Comments 0
You need to be logged in to leave comments. Login now