undo changes

Author: jathu

examples/arm/executor_runner/CMakeLists.txt

@@ -576,16 +576,22 @@ if(EXECUTORCH_ENABLE_EVENT_TRACER)
             "${ET_BUILD_DIR_PATH}/lib/libetdump.a"
   )
 
-  add_library(flatccrt STATIC IMPORTED)
+  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
+      TARGET ${FLATCCRT_LIB}
       PROPERTY IMPORTED_LOCATION
-            "${ET_BUILD_DIR_PATH}/third-party/flatcc/lib/libflatccrt.a"
+            "${ET_BUILD_DIR_PATH}/lib/lib${FLATCCRT_LIB}.a"
   )
 
   list(APPEND arm_executor_runner_link
     etdump
-    flatccrt
+    ${FLATCCRT_LIB}
   )
 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 gflags
+  ${FLATCCRT_LIB} gflags
 )
 set_target_properties(
   qnn_executor_runner PROPERTIES LINK_FLAGS "-Wl,-rpath='$ORIGIN'"

third-party/CMakeLists.txt

@@ -83,16 +83,18 @@ set(FLATCC_REFLECTION OFF CACHE BOOL "")
 set(FLATCC_DEBUG_CLANG_SANITIZE OFF CACHE BOOL "")
 set(FLATCC_INSTALL OFF CACHE BOOL "")
 add_subdirectory(flatcc)
+if(CMAKE_BUILD_TYPE MATCHES "Debug")
+  set(FLATCCRT_LIB flatccrt_d)
+else()
+  set(FLATCCRT_LIB flatccrt)
+endif()
 # Fix for "relocation R_X86_64_32 against `.rodata' can not be used when making
 # a shared object; recompile with -fPIC" when building on some x86 linux
 # systems.
 #
 # 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
+  TARGETS ${FLATCCRT_LIB}
   DESTINATION ${CMAKE_BINARY_DIR}/lib
 )

tools/cmake/executorch-config.cmake

@@ -56,12 +56,18 @@ 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
+    ${FLATCCRT_LIB}
     coreml_util
     coreml_inmemoryfs
     coremldelegate