Update

[ghstack-poisoned]

Author: swolchok

backends/vulkan/CMakeLists.txt

@@ -24,10 +24,10 @@ if(NOT RUNTIME_PATH)
   set(RUNTIME_PATH ${CMAKE_CURRENT_SOURCE_DIR}/runtime)
 endif()
 
-# Include this file to access target_link_options_shared_lib This is required to
-# provide access to target_link_options_shared_lib which allows libraries to be
-# linked with the --whole-archive flag. This is required for libraries that
-# perform dynamic registration via static initialization.
+# Include this file to access executorch_target_link_options_shared_lib This is
+# required to provide access to executorch_target_link_options_shared_lib which
+# allows libraries to be linked with the --whole-archive flag. This is required
+# for libraries that perform dynamic registration via static initialization.
 include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
 
 include(cmake/ShaderLibrary.cmake)
@@ -113,7 +113,7 @@ target_include_directories(
 target_link_libraries(vulkan_backend PRIVATE vulkan_schema executorch_core)
 target_compile_options(vulkan_backend PRIVATE ${VULKAN_CXX_FLAGS})
 # Link this library with --whole-archive due to dynamic backend registration
-target_link_options_shared_lib(vulkan_backend)
+executorch_target_link_options_shared_lib(vulkan_backend)
 
 set_property(TARGET vulkan_backend PROPERTY CXX_STANDARD 17)
 

backends/vulkan/cmake/ShaderLibrary.cmake

@@ -81,7 +81,7 @@ function(vulkan_shader_lib library_name generated_spv_cpp)
   target_link_libraries(${library_name} vulkan_backend)
   target_compile_options(${library_name} PRIVATE ${VULKAN_CXX_FLAGS})
   # Link this library with --whole-archive due to dynamic shader registrations
-  target_link_options_shared_lib(${library_name})
+  executorch_target_link_options_shared_lib(${library_name})
 endfunction()
 
 # Convenience macro to generate a SPIR-V shader library target. Given the path
@@ -105,7 +105,7 @@ macro(vulkan_shader_library shaders_path library_name)
   target_link_libraries(${library_name} vulkan_backend)
   target_compile_options(${library_name} PRIVATE ${VULKAN_CXX_FLAGS})
   # Link this library with --whole-archive due to dynamic shader registrations
-  target_link_options_shared_lib(${library_name})
+  executorch_target_link_options_shared_lib(${library_name})
 
   unset(VULKAN_SHADERGEN_ENV)
   unset(VULKAN_SHADERGEN_OUT_PATH)

backends/vulkan/test/CMakeLists.txt

@@ -35,8 +35,8 @@ if(TARGET vulkan_backend)
     set(PYTHON_EXECUTABLE python3)
   endif()
 
-  # Include this file to access target_link_options_shared_lib This is required
-  # to provide access to target_link_options_shared_lib which allows libraries
+  # Include this file to access executorch_target_link_options_shared_lib This is required
+  # to provide access to executorch_target_link_options_shared_lib which allows libraries
   # to be linked with the --whole-archive flag. This is required for libraries
   # that perform dynamic registration via static initialization.
   include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
@@ -75,7 +75,7 @@ if(TARGET vulkan_backend)
       ${CMAKE_CURRENT_SOURCE_DIR}/vulkan_compute_api_test.cpp
   )
 
-  target_link_options_shared_lib(vulkan_backend)
+  executorch_target_link_options_shared_lib(vulkan_backend)
 
   add_executable(
     vulkan_compute_api_test ${COMPUTE_API_TEST_CPP} ${TEST_UTILS_CPP}

backends/vulkan/test/op_tests/CMakeLists.txt

@@ -29,8 +29,8 @@ if(NOT EXECUTORCH_ROOT)
   set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
 endif()
 
-# Include this file to access target_link_options_shared_lib This is required to
-# provide access to target_link_options_shared_lib which allows libraries to be
+# Include this file to access executorch_target_link_options_shared_lib This is required to
+# provide access to executorch_target_link_options_shared_lib which allows libraries to be
 # linked with the --whole-archive flag. This is required for libraries that
 # perform dynamic registration via static initialization.
 include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
@@ -66,7 +66,7 @@ set(COMMON_INCLUDES
     ${TORCH_BASE_PATH}/include/torch/csrc/api/include
 )
 
-target_link_options_shared_lib(vulkan_backend)
+executorch_target_link_options_shared_lib(vulkan_backend)
 
 function(vulkan_op_test test_name test_src)
   set(extra_deps ${ARGN})

tools/cmake/preset/linux.cmake

@@ -7,4 +7,5 @@
 include(${PROJECT_SOURCE_DIR}/tools/cmake/preset/llm.cmake)
 
 set_overridable_option(EXECUTORCH_BUILD_EXECUTOR_RUNNER ON)
+set_overridable_option(EXECUTORCH_BUILD_EXTENSION_EVALUE_UTIL ON)
 set_overridable_option(EXECUTORCH_BUILD_EXTENSION_RUNNER_UTIL ON)

tools/cmake/preset/macos.cmake

@@ -6,5 +6,7 @@
 
 include(${PROJECT_SOURCE_DIR}/tools/cmake/preset/apple_common.cmake)
 
+set_overridable_option(EXECUTORCH_BUILD_EXTENSION_EVALUE_UTIL ON)
+set_overridable_option(EXECUTORCH_BUILD_EXTENSION_RUNNER_UTIL ON)
 set_overridable_option(EXECUTORCH_BUILD_EXECUTOR_RUNNER ON)
 set_overridable_option(EXECUTORCH_COREML_BUILD_EXECUTOR_RUNNER ON)