From: 박종현/동작제어Lab(SR)/Staff Engineer/삼성전자 <jh1302.park@samsung.com>
Date: Mon, 2 Jul 2018 10:32:45 +0000 (+0900)
Subject: Enable DOWNLOAD_CAFFE by default (#433)
X-Git-Tag: nncc_backup~2535
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a7414bc97bbae2c858eb3aad5934ba4d75737f1;p=platform%2Fcore%2Fml%2Fnnfw.git

Enable DOWNLOAD_CAFFE by default (#433)

This commit changes the default value of DOWNLOAD_CAFFE as ON, and
updates docker-build scripts to allow CI to override CAFFE_URL.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca27820..b76a50f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ option(DOWNLOAD_NEON2SSE "Download NEON2SSE library source" OFF)
 option(DOWNLOAD_GFLAGS "Download GFlags source" OFF)
 option(DOWNLOAD_FLATBUFFERS "Download FlatBuffers source" ON)
 option(DOWNLOAD_TENSORFLOW "Download TensorFlow source" OFF)
-option(DOWNLOAD_CAFFE "Download Caffe source" OFF)
+option(DOWNLOAD_CAFFE "Download Caffe source" ON)
 
 option(BUILD_GTEST "Download and build Google Test" ON)
 
diff --git a/scripts/command/docker-build b/scripts/command/docker-build
index ea6ef68..20b6bfe 100644
--- a/scripts/command/docker-build
+++ b/scripts/command/docker-build
@@ -18,6 +18,7 @@ DOCKER_VOLUMES=" -v $HOST_PATH:$DOCKER_PATH"
 DOCKER_ENV_VARS+=" -e http_proxy"
 DOCKER_ENV_VARS+=" -e no_proxy"
 DOCKER_ENV_VARS+=" -e GIT_SSL_NO_VERIFY"
+DOCKER_ENV_VARS+=" -e CAFFE_URL"
 DOCKER_ENV_VARS+=" -e GTEST_URL"
 DOCKER_ENV_VARS+=" -e FLATBUFFERS_URL"