fix libflatccrt

Author: jathu

CMakeLists.txt

@@ -455,22 +455,6 @@ if(EXECUTORCH_BUILD_GFLAGS)
   add_subdirectory(third-party/gflags)
 endif()
 
-# Install `executorch` library as well as `executorch-config.cmake` under
-# ${CMAKE_INSTALL_PREFIX}/
-install(DIRECTORY runtime/core/  DESTINATION include/executorch/runtime/core FILES_MATCHING PATTERN "*.h")
-install(DIRECTORY runtime/kernel/  DESTINATION include/executorch/runtime/kernel FILES_MATCHING PATTERN "*.h")
-install(DIRECTORY runtime/platform/  DESTINATION include/executorch/runtime/platform FILES_MATCHING PATTERN "*.h")
-install(DIRECTORY extension/kernel_util/  DESTINATION include/executorch/extension/kernel_util FILES_MATCHING PATTERN "*.h")
-install(DIRECTORY extension/tensor/  DESTINATION include/executorch/extension/tensor FILES_MATCHING PATTERN "*.h")
-install(DIRECTORY extension/threadpool/  DESTINATION include/executorch/extension/threadpool FILES_MATCHING PATTERN "*.h")
-install(
-  TARGETS executorch executorch_core
-  DESTINATION lib
-  INCLUDES
-  DESTINATION ${_common_include_directories}
-)
-install(FILES tools/cmake/executorch-config.cmake DESTINATION lib/cmake/ExecuTorch)
-
 # Add googletest if any test targets should be built
 if(BUILD_TESTING)
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third-party/googletest)
@@ -724,3 +708,19 @@ if(EXECUTORCH_BUILD_VULKAN)
 endif()
 
 include(Test.cmake)
+
+# Install `executorch` library as well as `executorch-config.cmake` under
+# ${CMAKE_INSTALL_PREFIX}/
+install(DIRECTORY runtime/core/  DESTINATION include/executorch/runtime/core FILES_MATCHING PATTERN "*.h")
+install(DIRECTORY runtime/kernel/  DESTINATION include/executorch/runtime/kernel FILES_MATCHING PATTERN "*.h")
+install(DIRECTORY runtime/platform/  DESTINATION include/executorch/runtime/platform FILES_MATCHING PATTERN "*.h")
+install(DIRECTORY extension/kernel_util/  DESTINATION include/executorch/extension/kernel_util FILES_MATCHING PATTERN "*.h")
+install(DIRECTORY extension/tensor/  DESTINATION include/executorch/extension/tensor FILES_MATCHING PATTERN "*.h")
+install(DIRECTORY extension/threadpool/  DESTINATION include/executorch/extension/threadpool FILES_MATCHING PATTERN "*.h")
+install(
+  TARGETS executorch executorch_core
+  DESTINATION lib
+  INCLUDES
+  DESTINATION ${_common_include_directories}
+)
+install(FILES tools/cmake/executorch-config.cmake DESTINATION lib/cmake/ExecuTorch)

examples/arm/executor_runner/CMakeLists.txt

@@ -576,22 +576,16 @@ if(EXECUTORCH_ENABLE_EVENT_TRACER)
             "${ET_BUILD_DIR_PATH}/lib/libetdump.a"
   )
 
-  if(CMAKE_BUILD_TYPE MATCHES "Debug")
-    set(FLATCCRT_LIB flatccrt_d)
-  else()
-    set(FLATCCRT_LIB flatccrt)
-  endif()
-
-  add_library(${FLATCCRT_LIB} STATIC IMPORTED)
+  add_library(flatccrt STATIC IMPORTED)
   set_property(
-      TARGET ${FLATCCRT_LIB}
+      TARGET flatccrt
       PROPERTY IMPORTED_LOCATION
-            "${ET_BUILD_DIR_PATH}/lib/lib${FLATCCRT_LIB}.a"
+            "${ET_BUILD_DIR_PATH}/third-party/flatcc/lib/libflatccrt.a"
   )
 
   list(APPEND arm_executor_runner_link
     etdump
-    ${FLATCCRT_LIB}
+    flatccrt
   )
 endif()
 

examples/qualcomm/executor_runner/CMakeLists.txt

@@ -20,7 +20,7 @@ target_include_directories(
 )
 target_link_libraries(
   qnn_executor_runner qnn_executorch_backend full_portable_ops_lib etdump
-  ${FLATCCRT_LIB} gflags
+  flatccrt gflags
 )
 set_target_properties(
   qnn_executor_runner PROPERTIES LINK_FLAGS "-Wl,-rpath='$ORIGIN'"

third-party/CMakeLists.txt

@@ -89,7 +89,10 @@ add_subdirectory(flatcc)
 #
 # Learn more: https://github.com/pytorch/executorch/pull/2467
 set_property(TARGET flatccrt PROPERTY POSITION_INDEPENDENT_CODE ON)
+# flatcc appends a "_d" (flatccrt_d) on debug builds. To simplify the build system
+# just force the same name for both builds.
+set_property(TARGET flatccrt PROPERTY DEBUG_POSTFIX "")
 install(
   TARGETS flatccrt
-  DESTINATION ${CMAKE_BINARY_DIR}/lib
+  DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/flatcc/lib
 )

tools/cmake/executorch-config.cmake

@@ -56,18 +56,12 @@ set(EXECUTORCH_FOUND ON)
 
 target_link_libraries(executorch INTERFACE executorch_core)
 
-if(CMAKE_BUILD_TYPE MATCHES "Debug")
-  set(FLATCCRT_LIB flatccrt_d)
-else()
-  set(FLATCCRT_LIB flatccrt)
-endif()
-
 set(lib_list
     etdump
     bundled_program
     extension_data_loader
     extension_flat_tensor
-    ${FLATCCRT_LIB}
+    flatccrt
     coreml_util
     coreml_inmemoryfs
     coremldelegate
@@ -106,7 +100,9 @@ foreach(lib ${lib_list})
   set(lib_var "LIB_${lib}")
   find_library(
     ${lib_var} ${lib}
-    HINTS "${_root}/lib"
+    HINTS
+      "${_root}/lib"
+      "${_root}/third-party/flatcc/lib"
     CMAKE_FIND_ROOT_PATH_BOTH
   )
   if(NOT ${lib_var})