From de4130659bcbbcc67a002f065f8c88bbe055309c Mon Sep 17 00:00:00 2001
From: jathu <jathu.satkunarajah@gmail.com>
Date: Tue, 27 May 2025 13:34:06 -0700
Subject: [PATCH] =?UTF-8?q?wip=20=E2=88=AB=20MAY=2027=202025=2013:34:04?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/cmake/common/preset.cmake   |  6 ++----
 tools/cmake/common/preset_test.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/tools/cmake/common/preset.cmake b/tools/cmake/common/preset.cmake
index 96706380e2c..e36539d5eab 100644
--- a/tools/cmake/common/preset.cmake
+++ b/tools/cmake/common/preset.cmake
@@ -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.
diff --git a/tools/cmake/common/preset_test.py b/tools/cmake/common/preset_test.py
index a3d27e87946..d56cc3bb04a 100644
--- a/tools/cmake/common/preset_test.py
+++ b/tools/cmake/common/preset_test.py
@@ -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)