Merge pull request #907 from jphickey/fix-906-cmake-system

Fix #906, Update variable checks in read_targetconfig
nasa · Sep 24, 2020 · ce187a2 · ce187a2
2 parents e01d421 + 8a8ac31
commit ce187a2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cmake/global_functions.cmake b/cmake/global_functions.cmake
@@ -185,10 +185,10 @@ function(read_targetconfig)
   endwhile()
 
   foreach(CPUNAME ${MISSION_CPUNAMES})
-    if (DEFINED SIMULATION)
+    if (SIMULATION)
       # if simulation use simulation system architecture for all targets
       set(TOOLCHAIN_NAME "${SIMULATION}")
-    elseif (DEFINED ${CPUNAME}_SYSTEM)
+    elseif (${CPUNAME}_SYSTEM)
       # get the target system arch identifier string
       set(TOOLCHAIN_NAME "${${CPUNAME}_SYSTEM}")
     else()