fix libflatccrt

Author: jathu

CMakeLists.txt

@@ -698,7 +698,7 @@ if(EXECUTORCH_BUILD_EXECUTOR_RUNNER)
   endif()
 
   if(EXECUTORCH_ENABLE_EVENT_TRACER)
-    list(APPEND _executor_runner_libs etdump flatccrt)
+    list(APPEND _executor_runner_libs etdump)
   endif()
 
   if(EXECUTORCH_BUILD_COREML)

backends/cadence/CMakeLists.txt

@@ -67,7 +67,6 @@ if(EXECUTORCH_CADENCE_CPU_RUNNER)
   extension_data_loader
   bundled_program
   cadence_ops_lib
-  flatccrt
   )
 endif()
 

devtools/etdump/CMakeLists.txt

@@ -45,10 +45,15 @@ add_library(
   ${CMAKE_CURRENT_SOURCE_DIR}/data_sinks/file_data_sink.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/data_sinks/file_data_sink.h
 )
+if(CMAKE_BUILD_TYPE MATCHES "Debug")
+  set(FLATCCRT_LIB flatccrt_d)
+else()
+  set(FLATCCRT_LIB flatccrt)
+endif()
 target_link_libraries(
   etdump
   PUBLIC
-    flatccrt
+    ${FLATCCRT_LIB}
   PRIVATE
     executorch
 )

devtools/etdump/tests/CMakeLists.txt

@@ -26,7 +26,6 @@ et_cxx_test(
   EXTRA_LIBS
   bundled_program
   etdump
-  flatccrt
 )
 target_include_directories(
   sdk_etdump_tests PRIVATE ${CMAKE_INSTALL_PREFIX}/sdk/include

examples/apple/mps/CMakeLists.txt

@@ -97,12 +97,6 @@ if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$")
   list(TRANSFORM _mps_executor_runner__srcs PREPEND "${EXECUTORCH_ROOT}/")
   add_executable(mps_executor_runner ${_mps_executor_runner__srcs})
 
-  if(CMAKE_BUILD_TYPE MATCHES "Debug")
-    set(FLATCC_LIB flatccrt_d)
-  else()
-    set(FLATCC_LIB flatccrt)
-  endif()
-
   if(CMAKE_BUILD_TYPE MATCHES "Debug")
     target_link_options(mps_executor_runner PUBLIC -fsanitize=undefined)
   endif()
@@ -113,7 +107,6 @@ if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$")
     executorch
     gflags
     etdump
-    ${FLATCC_LIB}
     mpsdelegate
     mps_portable_ops_lib
     ${mps_executor_runner_libs}

examples/arm/executor_runner/CMakeLists.txt

@@ -576,23 +576,7 @@ 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)
-  set_property(
-      TARGET ${FLATCCRT_LIB}
-      PROPERTY IMPORTED_LOCATION
-            "${ET_BUILD_DIR_PATH}/lib/lib${FLATCCRT_LIB}.a"
-  )
-
-  list(APPEND arm_executor_runner_link
-    etdump
-    ${FLATCCRT_LIB}
-  )
+  list(APPEND arm_executor_runner_link etdump)
 endif()
 
 if(ET_BUNDLE_IO)

examples/devtools/CMakeLists.txt

@@ -60,7 +60,6 @@ target_link_libraries(
   etdump
   extension_data_loader
   bundled_program
-  flatccrt
   portable_ops_lib
   portable_kernels
 )

examples/qualcomm/executor_runner/CMakeLists.txt

@@ -19,8 +19,11 @@ target_include_directories(
   qnn_executor_runner PUBLIC ${_common_include_directories}
 )
 target_link_libraries(
-  qnn_executor_runner qnn_executorch_backend full_portable_ops_lib etdump
-  ${FLATCCRT_LIB} gflags
+  qnn_executor_runner
+  qnn_executorch_backend
+  full_portable_ops_lib
+  etdump
+  gflags
 )
 set_target_properties(
   qnn_executor_runner PROPERTIES LINK_FLAGS "-Wl,-rpath='$ORIGIN'"

third-party/CMakeLists.txt

@@ -89,6 +89,9 @@ 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" suffix (flatccrt_d) to debug builds. To simplify our
+# reference to the lib, remove the suffix.
+set_property(TARGET flatccrt PROPERTY DEBUG_POSTFIX "")
 install(
   TARGETS flatccrt
   DESTINATION ${CMAKE_BINARY_DIR}/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
+    flatccrt
     etdump
     bundled_program
     extension_data_loader
     extension_flat_tensor
-    ${FLATCCRT_LIB}
     coreml_util
     coreml_inmemoryfs
     coremldelegate
@@ -154,6 +148,10 @@ if(TARGET coremldelegate)
   )
 endif()
 
+if(TARGET etdump)
+  set_target_properties(etdump PROPERTIES INTERFACE_LINK_LIBRARIES "flatccrt;executorch")
+endif()
+
 if(TARGET optimized_native_cpu_ops_lib)
   if(TARGET optimized_portable_kernels)
     set(_maybe_optimized_portable_kernels_lib optimized_portable_kernels)