diff options
| author |  Gil <mcg@google.com> | 2018-07-11 15:55:36 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-11 15:55:36 -0700 |
| commit | 7fc953fc6ffa69d159c0523d3902d867fe8c0ca5 (patch) | |
| tree | d8551a0c0d592f5937435819ca3d6e8c1bec72a9 /cmake/external/protobuf.cmake | |
| parent | e1ace703fbf4458d9e887ebf30050b1a0482a2d2 (diff) | |
Firestore CMake cleanup (#1510)
* Pull out sanitizer options into a separate file
* Reorder packages
* Remove the extra "external/$target" directory from PREFIX
Instead of BINARY_DIR/external/foo/src/foo the contents will be in
BINARY_DIR/src/foo.
* Make libprotobuf-nanopb targets line up with nanopb's CMakeLists.txt
* Fix CMake style
Diffstat (limited to 'cmake/external/protobuf.cmake')
| -rw-r--r-- | cmake/external/protobuf.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/external/protobuf.cmake b/cmake/external/protobuf.cmake index a6ad8f0..2cc632c 100644 --- a/cmake/external/protobuf.cmake +++ b/cmake/external/protobuf.cmake @@ -67,7 +67,7 @@ if(CMAKE_VERSION VERSION_LESS "3.7") list( APPEND configure ${cmake_args} - "${PROJECT_BINARY_DIR}/external/protobuf/src/protobuf/cmake" + "${PROJECT_BINARY_DIR}/src/protobuf/cmake" ) # Compose BUILD_COMMAND and INSTALL_COMMAND @@ -104,7 +104,7 @@ ExternalProject_Add( URL https://github.com/google/protobuf/archive/v3.5.1.1.tar.gz URL_HASH SHA256=56b5d9e1ab2bf4f5736c4cfba9f4981fbc6976246721e7ded5602fbaee6d6869 - PREFIX ${PROJECT_BINARY_DIR}/external/protobuf + PREFIX ${PROJECT_BINARY_DIR} INSTALL_DIR ${FIREBASE_INSTALL_DIR} ${commands} |