Change it so that the header files are directly included (#1865)

* Change it so that the header files are directly included

Remove the cmake injection and just include the header files as needed

* Add missing direct includes for assert, stdint, and string headers

* fix up the includes to c variants in c++ code

* Fix formatting

Author: AustinBenoit

analytics/CMakeLists.txt

@@ -129,28 +129,8 @@ target_compile_definitions(firebase_analytics
   PRIVATE
     -DINTERNAL_EXPERIMENTAL=1
 )
-# Automatically include headers that might not be declared.
-if(IOS)
-  if(MSVC)
-    target_compile_options(firebase_analytics PRIVATE
-      $<$<NOT:$<COMPILE_LANGUAGE:Swift>>:/FI"assert.h">
-      $<$<NOT:$<COMPILE_LANGUAGE:Swift>>:/FI"string.h">
-      $<$<NOT:$<COMPILE_LANGUAGE:Swift>>:/FI"stdint.h">)
-  else()
-    target_compile_options(firebase_analytics PRIVATE
-      $<$<NOT:$<COMPILE_LANGUAGE:Swift>>:SHELL:-include assert.h -include string.h>
-    )
-  endif()
-else()
-  if(MSVC)
-    target_compile_options(firebase_analytics PRIVATE
-      /FI"assert.h" /FI"string.h" /FI"stdint.h")
-  else()
-    target_compile_options(firebase_analytics PRIVATE
-      SHELL:-include assert.h -include string.h
-    )
-  endif()
-endif()
+
+
 
 if(ANDROID)
   firebase_cpp_proguard_file(analytics)

analytics/src/analytics_desktop.cc

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <cstdint>
 #include <future>
 #include <map>
 #include <mutex>

analytics/src/analytics_desktop_dynamic.h

@@ -23,6 +23,7 @@
 
 // --- Copied from original header ---
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 
 typedef struct GoogleAnalytics_Reserved_Opaque GoogleAnalytics_Reserved;

analytics/src/analytics_ios.mm

@@ -20,6 +20,8 @@
 #import "FIRAnalytics+OnDevice.h"
 #import "FIRAnalytics.h"
 
+#include <cassert>
+#include <cstdint>
 #include "analytics/src/analytics_common.h"
 #include "analytics/src/include/firebase/analytics.h"
 

app/CMakeLists.txt

@@ -308,28 +308,6 @@ else()
   set(app_flatbuffers_lib flatbuffers)
 endif()
 
-# Automatically include headers that might not be declared.
-# We use add_compile_options (instead of target_compile_options) so these
-# implicit includes apply globally to all targets in this directory,
-# including tests. Generator expressions ($<$<COMPILE_LANGUAGE:...>) are
-# used to ensure these C/C++ headers are not passed to the Swift compiler.
-if(MSVC)
-  add_compile_options(
-    $<$<COMPILE_LANGUAGE:CXX>:/FI"assert.h">
-    $<$<COMPILE_LANGUAGE:CXX>:/FI"string.h">
-    $<$<COMPILE_LANGUAGE:CXX>:/FI"stdint.h">)
-elseif(APPLE)
-  add_compile_options(
-    "$<$<COMPILE_LANGUAGE:CXX>:SHELL:-include assert.h>"
-    "$<$<COMPILE_LANGUAGE:CXX>:SHELL:-include string.h>"
-    "$<$<COMPILE_LANGUAGE:OBJCXX>:SHELL:-include assert.h>"
-    "$<$<COMPILE_LANGUAGE:OBJCXX>:SHELL:-include string.h>")
-else()
-  add_compile_options(
-    "$<$<COMPILE_LANGUAGE:CXX>:SHELL:-include assert.h>"
-    "$<$<COMPILE_LANGUAGE:CXX>:SHELL:-include string.h>")
-endif()
-
 add_library(firebase_app STATIC
     ${log_SRCS}
     ${log_HDRS}

app/rest/CMakeLists.txt

@@ -86,12 +86,6 @@ target_link_libraries(firebase_rest_lib
     zlibstatic
     ${CMAKE_DL_LIBS}
 )
-# Automatically include headers that might not be declared.
-if(MSVC)
-  add_definitions(/FI"assert.h" /FI"string.h" /FI"stdint.h")
-else()
-  add_definitions(-include assert.h -include string.h)
-endif()
 
 # Add shared definitions across all platforms, and then platform specific ones.
 add_definitions(

app/rest/controller_curl.cc

@@ -16,6 +16,7 @@
 
 #include "app/rest/controller_curl.h"
 
+#include <cstdint>
 #include <utility>
 
 #include "app/rest/transport_curl.h"

app/rest/gzipheader.cc

@@ -20,6 +20,8 @@
 #include <assert.h>
 
 #include <algorithm>
+#include <cstdint>
+#include <cstring>
 
 #include "app/src/assert.h"
 #include "app/src/util.h"

app/rest/request_json.h

@@ -17,6 +17,7 @@
 #ifndef FIREBASE_APP_REST_REQUEST_JSON_H_
 #define FIREBASE_APP_REST_REQUEST_JSON_H_
 
+#include <cassert>
 #include <string>
 
 #include "app/rest/request.h"

app/rest/request_options.h

@@ -17,6 +17,8 @@
 #ifndef FIREBASE_APP_REST_REQUEST_OPTIONS_H_
 #define FIREBASE_APP_REST_REQUEST_OPTIONS_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <string>