✨ Simplify build config by integrating data loader and baremetal exclusions.

Author: jathu

CMakeLists.txt

@@ -522,17 +522,6 @@ if(EXECUTORCH_BUILD_CORTEX_M)
 endif()
 
 if(EXECUTORCH_BUILD_DEVTOOLS)
-  if(NOT EXECUTORCH_BUILD_ARM_BAREMETAL)
-    set(EXECUTORCH_BUILD_EXTENSION_DATA_LOADER
-        ON
-        CACHE BOOL "EXECUTORCH_BUILD_EXTENSION_DATA_LOADER" FORCE
-    )
-  else()
-    set(EXECUTORCH_BUILD_EXTENSION_DATA_LOADER
-        OFF
-        CACHE BOOL "EXECUTORCH_BUILD_EXTENSION_DATA_LOADER" FORCE
-    )
-  endif()
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/devtools)
 endif()
 

tools/cmake/preset/default.cmake

@@ -295,6 +295,13 @@ check_required_options_on(
     EXECUTORCH_BUILD_DEVTOOLS
 )
 
+check_required_options_on(
+  IF_ON
+    EXECUTORCH_BUILD_DEVTOOLS
+  REQUIRES
+    EXECUTORCH_BUILD_EXTENSION_DATA_LOADER
+)
+
 check_required_options_on(
   IF_ON
     EXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR
@@ -342,6 +349,15 @@ check_required_options_on(
     EXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR
 )
 
+check_conflicting_options_on(
+  IF_ON
+    EXECUTORCH_BUILD_ARM_BAREMETAL
+  CONFLICTS_WITH
+    EXECUTORCH_BUILD_EXTENSION_DATA_LOADER
+    EXECUTORCH_BUILD_PTHREADPOOL
+    EXECUTORCH_BUILD_CPUINFO
+)
+
 
 if(NOT EXISTS ${EXECUTORCH_PAL_DEFAULT_FILE_PATH})
   message(FATAL_ERROR "PAL default implementation (EXECUTORCH_PAL_DEFAULT=${EXECUTORCH_PAL_DEFAULT}) file not found: ${EXECUTORCH_PAL_DEFAULT_FILE_PATH}. Choices: posix, minimal, android")
@@ -360,12 +376,3 @@ elseif(_executorch_log_level_lower STREQUAL "fatal")
 else()
   message(FATAL_ERROR "Unknown EXECUTORCH_LOG_LEVEL '${EXECUTORCH_LOG_LEVEL}'. Choices: Debug, Info, Error, Fatal")
 endif()
-
-
-if(EXECUTORCH_BUILD_ARM_BAREMETAL)
-  if(EXECUTORCH_BUILD_PTHREADPOOL)
-    message(FATAL_ERROR "Cannot enable both EXECUTORCH_BUILD_PTHREADPOOL and EXECUTORCH_BUILD_ARM_BAREMETAL")
-  elseif(EXECUTORCH_BUILD_CPUINFO)
-    message(FATAL_ERROR "Cannot enable both EXECUTORCH_BUILD_CPUINFO and EXECUTORCH_BUILD_ARM_BAREMETAL")
-  endif()
-endif()