From 0ec12d8666fc1e02edc259b0dda266effc4b40b3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=A2=85=ED=98=84/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Tue, 3 Jul 2018 16:50:43 +0900 Subject: [PATCH] Enable farmhash download by default (#479) This commit enables farmhash download by default, and updates docker configuration to support URL override inside CI. Signed-off-by: Jonghyun Park --- CMakeLists.txt | 2 +- scripts/docker.configuration | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e575f6..829b4ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ endmacro(nncc_find_package) ### Configuration ### option(DOWNLOAD_EIGEN "Download Eigen source" OFF) -option(DOWNLOAD_FARMHASH "Download farmhash source" OFF) +option(DOWNLOAD_FARMHASH "Download farmhash source" ON) option(DOWNLOAD_GEMMLOWP "Download GEMM low precesion library source" OFF) option(DOWNLOAD_NEON2SSE "Download NEON2SSE library source" OFF) option(DOWNLOAD_GFLAGS "Download GFlags source" OFF) diff --git a/scripts/docker.configuration b/scripts/docker.configuration index efc9998..c92c011 100644 --- a/scripts/docker.configuration +++ b/scripts/docker.configuration @@ -19,6 +19,7 @@ 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" +DOCKER_ENV_VARS+=" -e FARMHASH_URL" DOCKER_ENV_VARS+=" -e TENSORFLOW_URL" DOCKER_RUN_OPTS="--rm" -- 2.7.4