diff options
| author |  Gil <mcg@google.com> | 2018-06-26 13:43:21 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-26 13:43:21 -0700 |
| commit | ae7078ca2bdd362df43e5fdba0261c5c84c1b447 (patch) | |
| tree | 5e3ccec7f003694470e88e032632bdc4161ae39a | |
| parent | d6982830a50c39b0554478d6a420c684a9558eff (diff) | |
Install FirebaseCore during CMake build (#1462)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/FindFirebaseCore.cmake | 2 | ||||
| -rw-r--r-- | cmake/xcodebuild.cmake | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ca5c322..0cdddec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ if(NOT CMAKE_BUILD_TYPE) endif() if(APPLE) - # When building on the apple platform certain Objective-C++ classes bridge + # When building on the Apple platform certain Objective-C++ classes bridge # back into other Firebase Cocoapods. This requires shelling out to xcodebuild # to verify the built frameworks are up-to-date. You can disable this to speed # up the build. diff --git a/cmake/FindFirebaseCore.cmake b/cmake/FindFirebaseCore.cmake index 6e68dfb..eec29dd 100644 --- a/cmake/FindFirebaseCore.cmake +++ b/cmake/FindFirebaseCore.cmake @@ -15,7 +15,7 @@ find_library( FIREBASECORE_LIBRARY FirebaseCore - PATHS ${FIREBASE_BINARY_DIR}/Frameworks + PATHS ${FIREBASE_INSTALL_DIR}/Frameworks ) include(FindPackageHandleStandardArgs) diff --git a/cmake/xcodebuild.cmake b/cmake/xcodebuild.cmake index 01a2961..3c7be51 100644 --- a/cmake/xcodebuild.cmake +++ b/cmake/xcodebuild.cmake @@ -67,7 +67,7 @@ function(xcodebuild framework) # The source directory doesn't actually matter SOURCE_DIR ${PROJECT_SOURCE_DIR} - BINARY_DIR ${PROJECT_BINARY_DIR}/Frameworks + INSTALL_DIR ${FIREBASE_INSTALL_DIR}/Frameworks CONFIGURE_COMMAND "" @@ -77,7 +77,7 @@ function(xcodebuild framework) -scheme ${scheme} -configuration ${configuration} -destination ${destination} - CONFIGURATION_BUILD_DIR=<BINARY_DIR> + CONFIGURATION_BUILD_DIR=<INSTALL_DIR> build ${pipe_xcpretty} BUILD_ALWAYS ${BUILD_PODS} |