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 --- cmake/external/FirebaseCore.cmake | 27 --------------------------- cmake/external/GoogleUtilities.cmake | 27 --------------------------- cmake/external/firestore.cmake | 4 ---- 3 files changed, 58 deletions(-) delete mode 100644 cmake/external/FirebaseCore.cmake delete mode 100644 cmake/external/GoogleUtilities.cmake (limited to 'cmake/external') diff --git a/cmake/external/FirebaseCore.cmake b/cmake/external/FirebaseCore.cmake deleted file mode 100644 index a14397e..0000000 --- a/cmake/external/FirebaseCore.cmake +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2017 Google -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include(xcodebuild) - -if(TARGET FirebaseCore) - return() -endif() - -if(APPLE) - # FirebaseCore is only available as a CocoaPod build. - xcodebuild(FirebaseCore) -else() - # On non-Apple platforms, there's no way to build FirebaseCore. - add_custom_target(FirebaseCore) -endif() diff --git a/cmake/external/GoogleUtilities.cmake b/cmake/external/GoogleUtilities.cmake deleted file mode 100644 index a7a9ce8..0000000 --- a/cmake/external/GoogleUtilities.cmake +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2018 Google -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include(xcodebuild) - -if(TARGET GoogleUtilities) - return() -endif() - -if(APPLE) - # GoogleUtilities is only available as a CocoaPod build. - xcodebuild(GoogleUtilities) -else() - # On non-Apple platforms, there's no way to build GoogleUtilities. - add_custom_target(GoogleUtilities) -endif() diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake index d91a543..2409c50 100644 --- a/cmake/external/firestore.cmake +++ b/cmake/external/firestore.cmake @@ -13,8 +13,6 @@ # limitations under the License. include(ExternalProject) -include(external/FirebaseCore) -include(external/GoogleUtilities) include(external/googletest) include(external/grpc) include(external/leveldb) @@ -28,8 +26,6 @@ endif() ExternalProject_Add( Firestore DEPENDS - FirebaseCore - GoogleUtilities googletest grpc leveldb -- cgit v1.2.3