From 7fc953fc6ffa69d159c0523d3902d867fe8c0ca5 Mon Sep 17 00:00:00 2001 From: Gil Date: Wed, 11 Jul 2018 15:55:36 -0700 Subject: 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 --- cmake/external/googletest.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake/external/googletest.cmake') diff --git a/cmake/external/googletest.cmake b/cmake/external/googletest.cmake index 4e922c3..e2ebafc 100644 --- a/cmake/external/googletest.cmake +++ b/cmake/external/googletest.cmake @@ -26,7 +26,7 @@ ExternalProject_Add( URL https://github.com/google/googletest/archive/release-1.8.0.tar.gz URL_HASH SHA256=58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8 - PREFIX ${PROJECT_BINARY_DIR}/external/googletest + PREFIX ${PROJECT_BINARY_DIR} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${FIREBASE_INSTALL_DIR} -- cgit v1.2.3