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/c-ares.cmake | 2 +- cmake/external/firestore.cmake | 2 +- cmake/external/googletest.cmake | 2 +- cmake/external/grpc.cmake | 2 +- cmake/external/leveldb.cmake | 2 +- cmake/external/nanopb.cmake | 2 +- cmake/external/protobuf.cmake | 4 ++-- cmake/external/zlib.cmake | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'cmake/external') diff --git a/cmake/external/c-ares.cmake b/cmake/external/c-ares.cmake index 965eba9..dbe0eb0 100644 --- a/cmake/external/c-ares.cmake +++ b/cmake/external/c-ares.cmake @@ -25,7 +25,7 @@ ExternalProject_Add( URL https://github.com/c-ares/c-ares/archive/cares-1_14_0.tar.gz URL_HASH SHA256=62dd12f0557918f89ad6f5b759f0bf4727174ae9979499f5452c02be38d9d3e8 - PREFIX ${PROJECT_BINARY_DIR}/external/cares + PREFIX ${PROJECT_BINARY_DIR} CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake index 92789ca..d91a543 100644 --- a/cmake/external/firestore.cmake +++ b/cmake/external/firestore.cmake @@ -38,7 +38,7 @@ ExternalProject_Add( # Lay the binary directory out as if this were a subproject. This makes it # possible to build and test in it directly. - PREFIX ${PROJECT_BINARY_DIR}/external/Firestore + PREFIX ${PROJECT_BINARY_DIR} SOURCE_DIR ${PROJECT_SOURCE_DIR}/Firestore BINARY_DIR ${PROJECT_BINARY_DIR}/Firestore 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} diff --git a/cmake/external/grpc.cmake b/cmake/external/grpc.cmake index e25afe6..d35eb15 100644 --- a/cmake/external/grpc.cmake +++ b/cmake/external/grpc.cmake @@ -121,7 +121,7 @@ ExternalProject_Add( ${GRPC_GIT} - PREFIX ${PROJECT_BINARY_DIR}/external/grpc + PREFIX ${PROJECT_BINARY_DIR} CMAKE_ARGS ${CMAKE_ARGS} diff --git a/cmake/external/leveldb.cmake b/cmake/external/leveldb.cmake index 8b5d7eb..1d4510e 100644 --- a/cmake/external/leveldb.cmake +++ b/cmake/external/leveldb.cmake @@ -55,7 +55,7 @@ ExternalProject_Add( URL https://github.com/google/leveldb/archive/v1.20.tar.gz URL_HASH SHA256=f5abe8b5b209c2f36560b75f32ce61412f39a2922f7045ae764a2c23335b6664 - PREFIX ${FIREBASE_BINARY_DIR}/external/leveldb + PREFIX ${FIREBASE_BINARY_DIR} # LevelDB's configuration is done in the Makefile CONFIGURE_COMMAND "" diff --git a/cmake/external/nanopb.cmake b/cmake/external/nanopb.cmake index 7f1df78..b341c36 100644 --- a/cmake/external/nanopb.cmake +++ b/cmake/external/nanopb.cmake @@ -30,7 +30,7 @@ ExternalProject_Add( URL https://github.com/nanopb/nanopb/archive/nanopb-0.3.9.1.tar.gz URL_HASH SHA256=67460d0c0ad331ef4d5369ad337056d0cd2f900c94887628d287eb56c69324bc - PREFIX ${PROJECT_BINARY_DIR}/external/nanopb + PREFIX ${PROJECT_BINARY_DIR} CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} 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} 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