Removing setup stuff

nasa · Apr 14, 2021 · 9a1bb66 · 9a1bb66
1 parent 5852067
commit 9a1bb66
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/cmake/sample_defs/cpu1_cfe_es_startup.scr b/cmake/sample_defs/cpu1_cfe_es_startup.scr
@@ -3,9 +3,6 @@ CFE_APP, sample_app,  SAMPLE_APP_Main, SAMPLE_APP,   50,   16384, 0x0, 0;
 CFE_APP, ci_lab,      CI_Lab_AppMain,  CI_LAB_APP,   60,   16384, 0x0, 0;
 CFE_APP, to_lab,      TO_Lab_AppMain,  TO_LAB_APP,   70,   16384, 0x0, 0;
 CFE_APP, sch_lab,     SCH_Lab_AppMain, SCH_LAB_APP,  80,   16384, 0x0, 0;
-CFE_LIB, cfe_assert,     CFE_Assert_LibInit, ASSERT_LIB,  0,     0,      0x0, 0;
-CFE_APP, cfe_testrunner, CFE_TR_AppMain,     TESTRUN_APP, 100,   16384,  0x0, 0;
-CFE_LIB, cfe_testcase,   CFE_Test_Init,      CFETEST_LIB, 0,     0,      0x0, 0;
 !
 ! Startup script fields:
 ! 1. Object Type      -- CFE_APP for an Application, or CFE_LIB for a library.

diff --git a/cmake/sample_defs/global_build_options.cmake b/cmake/sample_defs/global_build_options.cmake
@@ -16,7 +16,6 @@
 # that omit the deprecated features from the build.  This is conditional in this
 # example for CI purposes, so it can be tested both ways.  Most projects would
 # likely set this only one way.
-set(MISSION_RESOURCEID_MODE STRICT)
 set(OMIT_DEPRECATED $ENV{OMIT_DEPRECATED} CACHE STRING "Omit deprecated elements")
 if (OMIT_DEPRECATED)
   message (STATUS "OMIT_DEPRECATED=true: Not including deprecated elements in build")