Fix nasa#711, Move core modules to arch_build

skliper · Jul 2, 2020 · af034c4 · af034c4
1 parent a0f3e15
commit af034c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/cmake/arch_build.cmake b/cmake/arch_build.cmake
@@ -48,7 +48,11 @@ function(initialize_globals)
   unset(VARNAME)
   unset(PARENTVARS)
   set(MISSION_IMPORTED_VARS ${MISSION_IMPORTED_VARS} PARENT_SCOPE)
-
+
+  # Default core modules, set early so it can be appended or replaced from user configuration
+  # NOT cached so it can be changed with simple config update
+  set(MISSION_CORE_MODULES msg PARENT_SCOPE)
+
 endfunction(initialize_globals)
 
 

diff --git a/cmake/mission_build.cmake b/cmake/mission_build.cmake
@@ -40,11 +40,6 @@ function(initialize_globals)
       set(MISSION_SOURCE_DIR ${MISSION_SOURCE_DIR} CACHE PATH "Top level mission source directory")
     endif(NOT DEFINED MISSION_SOURCE_DIR)
 
-    # Default core modules, set early so it can be appended or replaced from user configuration
-    if (NOT DEFINED MISSION_CORE_MODULES)
-      set(MISSION_CORE_MODULES msg CACHE PATH "Mission core modules")
-    endif (NOT DEFINED MISSION_CORE_MODULES)
-
     # The configuration should be in a subdirectory named "<mission>_defs".  If there is one
     # and only one of these, this is assumed to be it.  If there is more than one then the
     # user MUST specify which one is intended to be used by setting MISSIONCONFIG in the environment
@@ -253,7 +248,6 @@ function(prepare)
     "MISSION_APPS" 
     "MISSION_PSPMODULES" 
     "MISSION_DEPS"
-    "MISSION_CORE_MODULES"
     "ENABLE_UNIT_TESTS"
   )
   foreach(APP ${MISSION_DEPS})