Skip to content

Fix returning too early when setting options #11156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 27, 2025
Merged

Fix returning too early when setting options #11156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions tools/cmake/common/preset.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,9 @@ endmacro()
# Set an overridable option.
macro(set_overridable_option NAME VALUE)
# If the user has explitily set the option, do not override it.
if(DEFINED ${NAME})
return()
if(NOT DEFINED ${NAME})
set(${NAME} ${VALUE} CACHE STRING "")
endif()

set(${NAME} ${VALUE} CACHE STRING "")
endmacro()

# Detemine the build preset and load it.
Expand Down
28 changes: 28 additions & 0 deletions tools/cmake/common/preset_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,34 @@ def test_set_overridable_option_after(self):
self.run_cmake()
self.assert_cmake_cache("EXECUTORCH_TEST_MESSAGE", "move fast", "STRING")

def test_set_overridable_option_loaded_from_file(self):
_cmake_lists_txt = """
cmake_minimum_required(VERSION 3.24)
project(test_preset)
include(${PROJECT_SOURCE_DIR}/preset.cmake)
include(${PROJECT_SOURCE_DIR}/build/my_preset.cmake)
include(${PROJECT_SOURCE_DIR}/build/default.cmake)
"""
_my_preset_txt = """
set_overridable_option(EXECUTORCH_FOO "hello world")
"""
_default_preset_txt = """
define_overridable_option(EXECUTORCH_TEST_MESSAGE "test message" STRING "move fast")
define_overridable_option(EXECUTORCH_FOO "another test message" STRING "break things")
"""
self.create_workspace(
{
"CMakeLists.txt": _cmake_lists_txt,
"build": {
"my_preset.cmake": _my_preset_txt,
"default.cmake": _default_preset_txt,
},
}
)
self.run_cmake(cmake_args=["-DEXECUTORCH_TEST_MESSAGE='from the cli'"])
self.assert_cmake_cache("EXECUTORCH_TEST_MESSAGE", "from the cli", "STRING")
self.assert_cmake_cache("EXECUTORCH_FOO", "hello world", "STRING")

def test_set_overridable_option_with_cli_override(self):
_cmake_lists_txt = """
cmake_minimum_required(VERSION 3.24)
Expand Down
Loading