Skip to content

Commit c12ecbe

Browse files
authored
Configure conflicting ARM baremetal cmake flags (#11493)
### Summary Similar to #11457, but now we also want to warn against unsupported/conflicting flags. For example, when using `EXECUTORCH_BUILD_ARM_BAREMETAL`, we cannot enable certain flags. ### Test plan CI ``` $ cmake -DEXECUTORCH_BUILD_ARM_BAREMETAL=ON --preset macos CMake Error at tools/cmake/common/preset.cmake:142 (message): Both 'EXECUTORCH_BUILD_ARM_BAREMETAL' and 'EXECUTORCH_BUILD_EXTENSION_DATA_LOADER' can't be ON Call Stack (most recent call first): tools/cmake/preset/default.cmake:352 (check_conflicting_options_on) CMakeLists.txt:87 (include) ``` cc @larryliu0820 @digantdesai @freddan80 @per @zingo @oscarandersson8218
1 parent 2dc822e commit c12ecbe

File tree

2 files changed

+9
-20
lines changed

2 files changed

+9
-20
lines changed

CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -514,17 +514,6 @@ if(EXECUTORCH_BUILD_CORTEX_M)
514514
endif()
515515

516516
if(EXECUTORCH_BUILD_DEVTOOLS)
517-
if(NOT EXECUTORCH_BUILD_ARM_BAREMETAL)
518-
set(EXECUTORCH_BUILD_EXTENSION_DATA_LOADER
519-
ON
520-
CACHE BOOL "EXECUTORCH_BUILD_EXTENSION_DATA_LOADER" FORCE
521-
)
522-
else()
523-
set(EXECUTORCH_BUILD_EXTENSION_DATA_LOADER
524-
OFF
525-
CACHE BOOL "EXECUTORCH_BUILD_EXTENSION_DATA_LOADER" FORCE
526-
)
527-
endif()
528517
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/devtools)
529518
endif()
530519

tools/cmake/preset/default.cmake

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,15 @@ check_required_options_on(
337337
EXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR
338338
)
339339

340+
check_conflicting_options_on(
341+
IF_ON
342+
EXECUTORCH_BUILD_ARM_BAREMETAL
343+
CONFLICTS_WITH
344+
EXECUTORCH_BUILD_EXTENSION_DATA_LOADER
345+
EXECUTORCH_BUILD_PTHREADPOOL
346+
EXECUTORCH_BUILD_CPUINFO
347+
)
348+
340349

341350
if(NOT EXISTS ${EXECUTORCH_PAL_DEFAULT_FILE_PATH})
342351
message(FATAL_ERROR "PAL default implementation (EXECUTORCH_PAL_DEFAULT=${EXECUTORCH_PAL_DEFAULT}) file not found: ${EXECUTORCH_PAL_DEFAULT_FILE_PATH}. Choices: posix, minimal, android")
@@ -355,12 +364,3 @@ elseif(_executorch_log_level_lower STREQUAL "fatal")
355364
else()
356365
message(FATAL_ERROR "Unknown EXECUTORCH_LOG_LEVEL '${EXECUTORCH_LOG_LEVEL}'. Choices: Debug, Info, Error, Fatal")
357366
endif()
358-
359-
360-
if(EXECUTORCH_BUILD_ARM_BAREMETAL)
361-
if(EXECUTORCH_BUILD_PTHREADPOOL)
362-
message(FATAL_ERROR "Cannot enable both EXECUTORCH_BUILD_PTHREADPOOL and EXECUTORCH_BUILD_ARM_BAREMETAL")
363-
elseif(EXECUTORCH_BUILD_CPUINFO)
364-
message(FATAL_ERROR "Cannot enable both EXECUTORCH_BUILD_CPUINFO and EXECUTORCH_BUILD_ARM_BAREMETAL")
365-
endif()
366-
endif()

0 commit comments

Comments
 (0)