Fix SDK CMake

Author: tarun292

CMakeLists.txt

@@ -324,6 +324,13 @@ if(EXECUTORCH_BUILD_ANDROID_DEMO_APP_JNI)
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/examples/demo-apps/android/jni)
 endif()
 
+if(EXECUTORCH_BUILD_SDK)
+  set(EXECUTORCH_BUILD_EXTENSION_DATA_LOADER ON CACHE BOOL "EXECUTORCH_BUILD_EXTENSION_DATA_LOADER" FORCE)
+  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sdk)
+  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/util)
+  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/examples/sdk)
+endif()
+
 option(EXECUTORCH_BUILD_EXTENSION_DATA_LOADER
        "Build the extension/data_loader directory" OFF)
 if(EXECUTORCH_BUILD_EXTENSION_DATA_LOADER)
@@ -377,12 +384,6 @@ if(EXECUTORCH_BUILD_SIZE_TEST)
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/test)
 endif()
 
-if(EXECUTORCH_BUILD_SDK)
-  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sdk)
-  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/util)
-  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/examples/sdk)
-endif()
-
 if(EXECUTORCH_BUILD_EXAMPLES)
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/examples)
 endif()

sdk/CMakeLists.txt

@@ -30,6 +30,10 @@ if(NOT EXECUTORCH_ROOT)
   set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/..)
 endif()
 
+if(NOT FLATC_EXECUTABLE)
+  set(FLATC_EXECUTABLE flatc)
+endif()
+
 # Paths to headers generated from the .fbs files. set(_etdump_schemas
 # etdump_schema_flatcc.fbs scalar_type.fbs)
 
@@ -38,12 +42,9 @@ set(_etdump_schema__srcs
     ${CMAKE_CURRENT_SOURCE_DIR}/etdump/scalar_type.fbs)
 
 
-set(_bundled_program_schema_dir
-     ${CMAKE_CURRENT_SOURCE_DIR}/bundled_program/schema)
-
 set(_bundled_program_schema__srcs
-    ${_bundled_program_schema_dir}/bundled_program_schema.fbs
-    ${_bundled_program_schema_dir}/scalar_type.fbs)
+    ${CMAKE_CURRENT_SOURCE_DIR}/bundled_program/schema/bundled_program_schema.fbs
+    ${CMAKE_CURRENT_SOURCE_DIR}/bundled_program/schema/scalar_type.fbs)
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../third-party/flatcc
                  ${CMAKE_BINARY_DIR}/third-party/flatcc)
@@ -53,6 +54,7 @@ include(ExternalProject)
 
 # The include directory that will contain the generated schema headers.
 set(_program_schema__include_dir "${CMAKE_BINARY_DIR}/sdk/include")
+set(_bundled_schema__include_dir "${CMAKE_BINARY_DIR}/sdk/bundled_program")
 
 # Add the host project
 # lint_cmake: -readability/wonkycase
@@ -75,7 +77,7 @@ set(_bundled_program_schema__outputs)
 foreach(fbs_file ${_bundled_program_schema__srcs})
   string(REGEX REPLACE "[.]fbs$" "_generated.h" generated "${fbs_file}")
   list(APPEND _bundled_program_schema__outputs
-       "${_program_schema__include_dir}/${generated}")
+       "${_bundled_schema__include_dir}/${generated}")
 endforeach()
 
 add_library(etdump_schema INTERFACE ${_etdump_schema__outputs})
@@ -104,23 +106,32 @@ add_custom_command(
   COMMENT "Generating etdump headers"
   VERBATIM)
 
-add_custom_command(
-  OUTPUT ${_bundled_program_schema__outputs}
-  COMMAND
-    ${CMAKE_SOURCE_DIR}/third-party/flatcc/bin/flatcc -cwr -o
-    ${_program_schema__include_dir}/executorch/sdk/bundled_program
-    ${_bundled_program_schema__srcs}
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/sdk
-  DEPENDS flatcc_project
-  COMMENT "Generating bundled_program headers"
-  VERBATIM)
-
-target_include_directories(
-  etdump PUBLIC ${_program_schema__include_dir}
-                ${CMAKE_SOURCE_DIR}/third-party/flatcc/include)
+add_library(etdump ${CMAKE_CURRENT_SOURCE_DIR}/etdump/etdump_flatcc.cpp)
+target_link_libraries(
+	etdump
+	PUBLIC etdump_schema
+	PRIVATE executorch)
+
+ add_custom_command(
+    OUTPUT ${_bundled_program_schema__outputs}
+    COMMAND
+      ${FLATC_EXECUTABLE} --cpp --cpp-std c++11 --gen-mutable --scoped-enums -o
+      "${_bundled_schema__include_dir}/executorch/sdk/bundled_program/schema" ${_bundled_program_schema__srcs}
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/sdk
+    DEPENDS ${FLATC_EXECUTABLE} ${_bundled_program_schema__srcs}
+    COMMENT "Generating bundled_program headers"
+    VERBATIM)
+
+#add_library(bundled_program INTERFACE ${_bundled_program_schema__outputs})
+add_library(bundled_program ${CMAKE_CURRENT_SOURCE_DIR}/bundled_program/bundled_program.cpp)
+target_link_libraries(bundled_program executorch bundled_program_schema)
 
 set_target_properties(bundled_program PROPERTIES LINKER_LANGUAGE CXX)
 target_include_directories(
   bundled_program
-  INTERFACE ${_program_schema__include_dir}
+  PUBLIC ${_bundled_schema__include_dir}
             ${EXECUTORCH_ROOT}/third-party/flatbuffers/include)
+
+target_include_directories(
+  etdump PUBLIC ${_program_schema__include_dir}
+                ${CMAKE_SOURCE_DIR}/third-party/flatcc/include)

util/CMakeLists.txt

@@ -3,8 +3,3 @@
 #
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
-
-add_library(bundled_program
-            ${CMAKE_CURRENT_SOURCE_DIR}/bundled_program_verification.cpp)
-
-target_link_libraries(bundled_program executorch bundled_schema)