From c7fb0a487523b3686a03e3b7f9b459fcb9323a36 Mon Sep 17 00:00:00 2001 From: Gil Date: Mon, 16 Jul 2018 11:46:55 -0700 Subject: Generate CMake frameworks from podspecs (#1531) * Rename utils.cmake to cc_rules.cmake This makes it less of a dumping ground * Fix sign mismatch in FIRApp * Implement a podspec_framework CMake function ... that generates a CMake framework library target from a podspec. * Remove manual CMake scripts for xcodebuild --- Firestore/CMakeLists.txt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'Firestore/CMakeLists.txt') diff --git a/Firestore/CMakeLists.txt b/Firestore/CMakeLists.txt index 039cb06..831d8ab 100644 --- a/Firestore/CMakeLists.txt +++ b/Firestore/CMakeLists.txt @@ -34,14 +34,11 @@ set(FIREBASE_BINARY_DIR ${PROJECT_BINARY_DIR}/..) list(INSERT CMAKE_MODULE_PATH 0 ${FIREBASE_SOURCE_DIR}/cmake) include(SanitizerOptions) -include(utils) +include(cc_rules) +include(podspec_rules) # External packages -if(APPLE) - find_package(FirebaseCore REQUIRED) - find_package(GoogleUtilities REQUIRED) -endif() find_package(LevelDB REQUIRED) find_package(ZLIB) @@ -128,6 +125,16 @@ target_include_directories( enable_testing() include(CompilerSetup) +# Firebase packages +podspec_framework( + ${FIREBASE_SOURCE_DIR}/GoogleUtilities.podspec + SPECS Logger +) + +podspec_framework( + ${FIREBASE_SOURCE_DIR}/FirebaseCore.podspec +) + # Superbuild installed results include_directories(${FIREBASE_INSTALL_DIR}/include) -- cgit v1.2.3