From 2810a09c582b09104c04f16e5a3086cbe3e79d23 Mon Sep 17 00:00:00 2001 From: Gil Date: Tue, 26 Jun 2018 11:58:10 -0700 Subject: Prepare for installed sub-projects (#1459) * Ignore vim backup files * Prepare for installed subprojects This adds FIREBASE_BINARY_DIR to point to the out-of-source build directory (which previously was passed around as FIREBASE_INSTALL_DIR). This repurposes FIREBASE_INSTALL_DIR to point to ${FIREBASE_BINARY_DIR}/opt, and installation root for subprojects that have an install step. * Allow download directory to be specified --- cmake/external/protobuf.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake/external/protobuf.cmake') diff --git a/cmake/external/protobuf.cmake b/cmake/external/protobuf.cmake index acc5a96..21cfac3 100644 --- a/cmake/external/protobuf.cmake +++ b/cmake/external/protobuf.cmake @@ -17,7 +17,7 @@ include(ExternalProject) ExternalProject_Add( protobuf - DOWNLOAD_DIR ${PROJECT_BINARY_DIR}/downloads + DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR} DOWNLOAD_NAME protobuf-v3.5.11.tar.gz URL https://github.com/google/protobuf/archive/v3.5.1.1.tar.gz URL_HASH SHA256=56b5d9e1ab2bf4f5736c4cfba9f4981fbc6976246721e7ded5602fbaee6d6869 -- cgit v1.2.3