Skip to content

Commit edee562

Browse files
authored
Merge pull request #467 from firebase/bugfix/app-ios-headers-copy
Fix for headers not copied over to firebase.framework while building ios/tvos
2 parents 192c53b + e0e1ccb commit edee562

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

app/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,13 +525,14 @@ if (IOS)
525525

526526
# Generate Framework Headers from ${framework_HDRS}
527527
# Copy header from source dir "src/include/firebase/*" to destination dir "Headers/*"
528+
# Firestore has few headers from a different directory pattern (core/include/firebase/*).
528529
list(APPEND framework_HDRS ${internal_HDRS})
529530
foreach(hfile ${framework_HDRS})
530-
string(FIND ${hfile} "firebase/" pos_firebase)
531+
string(FIND ${hfile} "/include/firebase/" pos_firebase)
531532
string(COMPARE NOTEQUAL ${pos_firebase} -1 find)
532533
if(${find})
533534
string(FIND ${hfile} "/" pos_e REVERSE)
534-
math(EXPR pos_s "${pos_firebase} + 8")
535+
math(EXPR pos_s "${pos_firebase} + 17")
535536
math(EXPR len "${pos_e} - ${pos_s}")
536537
string(SUBSTRING ${hfile} ${pos_s} ${len} dir)
537538
# file(COPY ${hfile} DESTINATION Headers/${dir})

0 commit comments

Comments
 (0)