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/zlib.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake/external/zlib.cmake') diff --git a/cmake/external/zlib.cmake b/cmake/external/zlib.cmake index 3206f77..70efa6b 100644 --- a/cmake/external/zlib.cmake +++ b/cmake/external/zlib.cmake @@ -33,7 +33,7 @@ ExternalProject_Add( URL https://github.com/madler/zlib/archive/v1.2.11.tar.gz URL_HASH SHA256=629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff - PREFIX ${PROJECT_BINARY_DIR}/external/zlib + PREFIX ${PROJECT_BINARY_DIR} CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -- cgit v1.2.3