Change Firebase C++ usage of Flatbuffer CMake back to old method

The newer method does not have a way to add a dependency prior to running flatc, which is needed when doing an Android or iOS build.

PiperOrigin-RevId: 315564118

Author: a-maurice

app/CMakeLists.txt

@@ -70,13 +70,16 @@ set(FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS
     "--gen-generated"
     "--gen-object-api"
     "--cpp-ptr-type" "flatbuffers::unique_ptr")
-flatbuffers_generate_headers(
-    TARGET generate_app_fbs
-    SCHEMAS "${CMAKE_CURRENT_LIST_DIR}/google_services.fbs"
-    FLAGS ${FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS}
-    INCLUDE ${FIREBASE_FLATBUFFERS_DEPENDENCIES}
-    INCLUDE_PREFIX "app"
-)
+# Because of a bug in the version of Flatbuffers we are pinned to,
+# additional flags need to be set.
+set(FLATC_ARGS "${FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS}")
+build_flatbuffers("${CMAKE_CURRENT_LIST_DIR}/google_services.fbs"
+                  ""
+                  "app_generated_includes"
+                  "${FIREBASE_FLATBUFFERS_DEPENDENCIES}"
+                  "${FIREBASE_GEN_FILE_DIR}/app"
+                  ""
+                  "")
 
 set(log_common_SRCS
     src/log.cc
@@ -294,6 +297,7 @@ add_library(firebase_app STATIC
     ${internal_HDRS}
     ${utility_HDRS}
     ${app_platform_HDRS}
+    ${FIREBASE_GEN_FILE_DIR}/app/google_services_generated.h
     memory/atomic.h
     meta/move.h
     memory/unique_ptr.h
@@ -326,7 +330,6 @@ target_link_libraries(firebase_app
   PRIVATE
     flatbuffers
     ${LIBSECRET_LIBRARIES}
-    generate_app_fbs
 )
 # Automatically include headers that might not be declared.
 if(MSVC)

app/rest/tests/CMakeLists.txt

@@ -19,13 +19,16 @@ set(FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS
     "--gen-generated"
     "--gen-object-api"
     "--cpp-ptr-type" "flatbuffers::unique_ptr")
-flatbuffers_generate_headers(
-    TARGET generate_app_rest_tests_fbs
-    SCHEMAS "${CMAKE_CURRENT_LIST_DIR}/testdata/sample.fbs"
-    FLAGS ${FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS}
-    INCLUDE ${FIREBASE_FLATBUFFERS_DEPENDENCIES}
-    INCLUDE_PREFIX "app/rest"
-)
+# Because of a bug in the version of Flatbuffers we are pinned to,
+# additional flags need to be set.
+set(FLATC_ARGS "${FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS}")
+build_flatbuffers("${CMAKE_CURRENT_LIST_DIR}/testdata/sample.fbs"
+                  ""
+                  "app_rest_generated_includes"
+                  "${FIREBASE_FLATBUFFERS_DEPENDENCIES}"
+                  "${FIREBASE_GEN_FILE_DIR}/app/rest"
+                  ""
+                  "")
 
 binary_to_array("sample_resource"
     "${CMAKE_CURRENT_LIST_DIR}/testdata/sample.fbs"
@@ -35,18 +38,14 @@ binary_to_array("sample_resource"
 add_library(sample_resource_lib STATIC
   ${sample_resource_source}
   ${sample_resource_header}
+  ${FIREBASE_GEN_FILE_DIR}/app/rest/sample_generated.h
 )
 
 target_include_directories(sample_resource_lib
   PUBLIC
     ${FLATBUFFERS_SOURCE_DIR}/include
 )
 
-target_link_libraries(sample_resource_lib
-  PUBLIC
-    generate_app_rest_tests_fbs
-)
-
 firebase_cpp_cc_test(firebase_app_rest_request_test
   SOURCES
     request_test.h

messaging/CMakeLists.txt

@@ -22,13 +22,16 @@ set(FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS
     "--cpp-ptr-type" "flatbuffers::unique_ptr")
 set(flatbuffer_schemas
     ${CMAKE_CURRENT_LIST_DIR}/src/android/schemas/messaging.fbs)
-flatbuffers_generate_headers(
-    TARGET generate_messaging_fbs
-    SCHEMAS "${flatbuffer_schemas}"
-    FLAGS ${FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS}
-    INCLUDE ${FIREBASE_FLATBUFFERS_DEPENDENCIES}
-    INCLUDE_PREFIX "messaging"
-)
+# Because of a bug in the version of Flatbuffers we are pinned to,
+# additional flags need to be set.
+set(FLATC_ARGS "${FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS}")
+build_flatbuffers("${flatbuffer_schemas}"
+                  ""
+                  "generate_messaging_fbs"
+                  "${FIREBASE_FLATBUFFERS_DEPENDENCIES}"
+                  "${FIREBASE_GEN_FILE_DIR}/messaging"
+                  ""
+                  "")
 
 # Common source files used by all platforms
 set(common_SRCS
@@ -37,6 +40,7 @@ set(common_SRCS
 
 # Source files used by the Android implementation.
 set(android_SRCS
+    ${FIREBASE_GEN_FILE_DIR}/messaging/messaging_generated.h
     src/android/cpp/message_reader.cc
     src/android/cpp/message_reader.h
     src/android/cpp/messaging.cc)
@@ -76,7 +80,6 @@ if(ANDROID)
   target_link_libraries(firebase_messaging
     PRIVATE
       flatbuffers
-      generate_messaging_fbs
   )
 endif()
 # Public headers all refer to each other relative to the src/include directory,