followup fixes for llama example in Windows; add missing /WHOLEARCHIVE for executorch in Windows

Author: Yi Ren

examples/models/llama/CMakeLists.txt

@@ -80,7 +80,7 @@ find_package(gflags REQUIRED)
 # find `executorch` libraries Same as for gflags
 set(executorch_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../lib/cmake/ExecuTorch)
 find_package(executorch CONFIG REQUIRED)
-if(CMAKE_TOOLCHAIN_IOS OR ANDROID)
+if(CMAKE_TOOLCHAIN_IOS OR ANDROID OR WIN32 OR APPLE)
   target_link_options_shared_lib(executorch)
 endif()
 
@@ -231,9 +231,6 @@ target_include_directories(llama_main PUBLIC ${_common_include_directories})
 target_link_libraries(llama_main PUBLIC llama_runner ${link_libraries})
 target_compile_options(llama_main PUBLIC ${_common_compile_options})
 
-if(APPLE)
-  target_link_options_shared_lib(executorch)
-endif()
 
 # Print all summary
 executorch_print_configuration_summary()

examples/models/llama/runner/CMakeLists.txt

@@ -36,6 +36,11 @@ include(${EXECUTORCH_SRCS_FILE})
 
 # build llama_runner library
 list(TRANSFORM _llama_runner__srcs PREPEND "${EXECUTORCH_ROOT}/")
+if (WIN32)
+  set_property(TARGET extension_module PROPERTY
+              IMPORTED_IMPLIB "${EXECUTORCH_ROOT}/cmake-out/lib/extension_module.lib")
+
+endif()
 
 target_include_directories(
   extension_module INTERFACE ${_common_include_directories}
@@ -52,7 +57,7 @@ list(APPEND _llama_runner__srcs
 if(CMAKE_TOOLCHAIN_IOS
    OR ANDROID
    OR APPLE
-  OR WIN32
+   OR WIN32
 )
   # Building a share library on iOS requires code signing On Android we see
   # duplicated registration when using shared lib
@@ -76,24 +81,13 @@ add_subdirectory(
 )
 set(CMAKE_POSITION_INDEPENDENT_CODE ${_pic_flag})
 
-if (WIN32)
-  # in Windows, only extension_module_static works and has duplicated symbols with extension_tensor
-  set(llama_runner_deps executorch extension_data_loader extension_module_static
-                        re2::re2
-  )
-  # in Windows, need PUBLIC or sources files in executorch/examples/models/llama/runner/ cannot be found
-  target_include_directories(
-    llama_runner PUBLIC ${_common_include_directories} ${EXECUTORCH_ROOT}
-  )
-else()
 set(llama_runner_deps executorch extension_data_loader extension_module
                       extension_tensor re2::re2
 )
-target_include_directories(
-  llama_runner INTERFACE ${_common_include_directories} ${EXECUTORCH_ROOT}
-)
-endif()
 
 target_link_libraries(llama_runner PUBLIC ${llama_runner_deps})
 
-target_compile_options(llama_runner PUBLIC ${_preprocessor_flag})
+target_include_directories(
+  llama_runner INTERFACE ${_common_include_directories} ${EXECUTORCH_ROOT}
+)
+target_compile_options(llama_runner PUBLIC ${_preprocessor_flag})

extension/module/CMakeLists.txt

@@ -20,6 +20,7 @@ list(TRANSFORM _extension_module__srcs PREPEND "${EXECUTORCH_ROOT}/")
 if(CMAKE_TOOLCHAIN_IOS
    OR CMAKE_TOOLCHAIN_ANDROID
    OR APPLE
+   OR WIN32
 )
   # Building a share library on iOS requires code signing On Android we see
   # duplicated registration when using shared lib