diff options
| author |  Gil <mcg@google.com> | 2018-01-03 07:00:54 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-01-03 07:00:54 -0800 |
| commit | 5a6155f6a38a2d5515667406a5926c39753627e5 (patch) | |
| tree | da3395a715b01841cd8ae9d52d85cbfb6d0049b8 /cmake | |
| parent | 727edcead2b7620dcd0c586352486370e15ffa45 (diff) | |
Build and test both C++ loggers where possible (#595)
* Rename FIREBASE_BINARY_DIR to FIREBASE_INSTALL_DIR
Make this consistent with the outer superbuild and also make the
association with CMAKE_INSTALL_PREFIX more obvious.
* Build and test log_stdio separate from the rest of util
This is in preparation for adding a test for log_apple
* Build and test log_apple under CMake
Also add notes about how FIRLogger's debug mode can break this test
* Refactor log_apple to cut down duplicate switch statements
There's also a slight reduction in final binary size.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindFirebaseCore.cmake | 2 | ||||
| -rw-r--r-- | cmake/FindLevelDB.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
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/FindLevelDB.cmake b/cmake/FindLevelDB.cmake index ae32a17..386a298 100644 --- a/cmake/FindLevelDB.cmake +++ b/cmake/FindLevelDB.cmake @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -set(binary_dir ${FIREBASE_BINARY_DIR}/third_party/leveldb/src/leveldb) +set(binary_dir ${FIREBASE_INSTALL_DIR}/third_party/leveldb/src/leveldb) find_path( LEVELDB_INCLUDE_DIR leveldb/db.h |