Update CMake files with FIRInstanceId's new layout

a-maurice · a-maurice · commit 6a0476b7e8a6 · 2019-04-19T16:59:28.000-07:00
Instance ID changed their layout to be inline with the other iOS SDKs, so update the CMake scripts to use that layout instead.

PiperOrigin-RevId: 244440380
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -292,8 +292,7 @@ if(IOS)
     PRIVATE
       ${base_header_dir}/FirebaseCore
       ${base_header_dir}/FirebaseDynamicLinks
-      # FirebaseInstanceID headers are stored in a subdirectory
-      ${base_header_dir}/FirebaseInstanceID/FirebaseInstanceID
+      ${base_header_dir}/FirebaseInstanceID
   )
 
   # Add a dependency to downloading the headers onto app.
diff --git a/instance_id/CMakeLists.txt b/instance_id/CMakeLists.txt
@@ -103,8 +103,7 @@ if(IOS)
   target_include_directories(firebase_instance_id
     PRIVATE
       ${base_header_dir}/FirebaseCore
-      # FirebaseInstanceID headers are stored in a subdirectory
-      ${base_header_dir}/FirebaseInstanceID/FirebaseInstanceID
+      ${base_header_dir}/FirebaseInstanceID
   )
 
   # Add a dependency to downloading the headers onto instance_id.

Original file line number	Diff line number	Diff line change
`@@ -292,8 +292,7 @@ if(IOS)`
`292`	`292`	`PRIVATE`
`293`	`293`	`${base_header_dir}/FirebaseCore`
`294`	`294`	`${base_header_dir}/FirebaseDynamicLinks`
`295`		`- # FirebaseInstanceID headers are stored in a subdirectory`
`296`		`- ${base_header_dir}/FirebaseInstanceID/FirebaseInstanceID`
	`295`	`+ ${base_header_dir}/FirebaseInstanceID`
`297`	`296`	`)`
`298`	`297`
`299`	`298`	`# Add a dependency to downloading the headers onto app.`
Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,7 @@ if(IOS)`
`103`	`103`	`target_include_directories(firebase_instance_id`
`104`	`104`	`PRIVATE`
`105`	`105`	`${base_header_dir}/FirebaseCore`
`106`		`- # FirebaseInstanceID headers are stored in a subdirectory`
`107`		`- ${base_header_dir}/FirebaseInstanceID/FirebaseInstanceID`
	`106`	`+ ${base_header_dir}/FirebaseInstanceID`
`108`	`107`	`)`
`109`	`108`
`110`	`109`	`# Add a dependency to downloading the headers onto instance_id.`