Add support for building bundled_program schema in CMake (#656)

Summary:
Pull Request resolved: #656

- Move the schema building code into a function in `schema/CMakeLists.txt`
- Add support for building bundled program schema

Reviewed By: larryliu0820

Differential Revision: D49992580

fbshipit-source-id: b7c0aecef44fffd028006aaf52bf51470d11423a

Author: tarun292

CMakeLists.txt

@@ -112,14 +112,14 @@ option(EXECUTORCH_BUILD_SIZE_TEST "Whether to build size test" OFF)
 
 # Selective build options.
 option(EXECUTORCH_SELECT_ALL_OPS
-      "Whether to register all ops defined in portable kernel library." ON)
+       "Whether to register all ops defined in portable kernel library." ON)
 
 # Option to register op list
 option(EXECUTORCH_SELECT_OPS_LIST "Register the following list of ops" OFF)
 
 # Option to register ops from yaml file
-option(EXECUTORCH_SELECT_OPS_YAML
-      "Register all the ops from a given yaml file" OFF)
+option(EXECUTORCH_SELECT_OPS_YAML "Register all the ops from a given yaml file"
+       OFF)
 # Do not enable select all ops if any of the other select options is on.
 if(EXECUTORCH_SELECT_OPS_LIST OR EXECUTORCH_SELECT_OPS_YAML)
   set(EXECUTORCH_SELECT_ALL_OPS OFF)

schema/CMakeLists.txt

@@ -21,32 +21,35 @@ if(NOT EXECUTORCH_ROOT)
   set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/..)
 endif()
 
-# Paths to headers generated from the .fbs files.
-set(_program_schema__srcs program.fbs scalar_type.fbs)
-
-set(_program_schema__outputs)
-foreach(fbs_file ${_program_schema__srcs})
-  string(REGEX REPLACE "[.]fbs$" "_generated.h" generated "${fbs_file}")
-  list(APPEND _program_schema__outputs
-       "${_program_schema__include_dir}/executorch/${generated}")
-endforeach()
-
-# Generate the headers from the .fbs files.
-add_custom_command(
-  OUTPUT ${_program_schema__outputs}
-  COMMAND
-    ${FLATC_EXECUTABLE} --cpp --cpp-std c++11 --gen-mutable --scoped-enums
-    # Add a subdirectory to the include dir so the files can be included as
-    # <executorch/schema/x_generated.h>
-    -o "${_program_schema__include_dir}/executorch/schema"
-    ${_program_schema__srcs}
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  DEPENDS ${FLATC_EXECUTABLE} ${_program_schema__srcs}
-  COMMENT "Generating program_schema headers"
-  VERBATIM)
-
-add_library(program_schema INTERFACE ${_program_schema__outputs})
-set_target_properties(program_schema PROPERTIES LINKER_LANGUAGE CXX)
-target_include_directories(
-  program_schema INTERFACE ${_program_schema__include_dir}
-                           ${EXECUTORCH_ROOT}/third-party/flatbuffers/include)
+function(generate_program_schema _schema_srcs _schema_name)
+  set(_schema_outputs)
+  foreach(fbs_file ${_schema_srcs})
+    string(REGEX REPLACE "[.]fbs$" "_generated.h" generated "${fbs_file}")
+    list(APPEND _schema_outputs
+         "${_program_schema__include_dir}/executorch/${generated}")
+  endforeach()
+
+  # Generate the headers from the .fbs files.
+  add_custom_command(
+    OUTPUT ${_schema_outputs}
+    COMMAND
+      ${FLATC_EXECUTABLE} --cpp --cpp-std c++11 --gen-mutable --scoped-enums -o
+      "${_program_schema__include_dir}/executorch/schema" ${_schema_srcs}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    DEPENDS ${FLATC_EXECUTABLE} ${_schema_srcs}
+    COMMENT "Generating ${_schema_name} headers"
+    VERBATIM)
+
+  add_library(${_schema_name} INTERFACE ${_schema_outputs})
+  set_target_properties(${_schema_name} PROPERTIES LINKER_LANGUAGE CXX)
+  target_include_directories(
+    ${_schema_name}
+    INTERFACE ${_program_schema__include_dir}
+              ${EXECUTORCH_ROOT}/third-party/flatbuffers/include)
+endfunction()
+
+set(program_schema_srcs program.fbs scalar_type.fbs)
+generate_program_schema("${program_schema_srcs}" "program_schema")
+
+set(bundled_schema_srcs bundled_program_schema.fbs scalar_type.fbs)
+generate_program_schema("${bundled_schema_srcs}" "bundled_schema")