From b8ffd6e11f0dc0c47fdf25fabed3f638266a7f24 Mon Sep 17 00:00:00 2001 From: guohuijiang1234 Date: Fri, 24 Nov 2017 16:34:44 +0800 Subject: updata Makefile --- Makefile | 3 --- Makefile.config.acl | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2422f3b2..2afeae34 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,5 @@ PROJECT := caffe -AIDDIR=/usr/local/AID -export PKG_CONFIG_PATH=${AIDDIR}/opencv3.3.0/lib/pkgconfig - CONFIG_FILE := Makefile.config.acl # Explicitly check for the config file, otherwise make -k will proceed anyway. ifeq ($(wildcard $(CONFIG_FILE)),) diff --git a/Makefile.config.acl b/Makefile.config.acl index 6dcc7cdf..f20326f9 100644 --- a/Makefile.config.acl +++ b/Makefile.config.acl @@ -1,6 +1,9 @@ ## Refer to http://caffe.berkeleyvision.org/installation.html # Contributions simplifying and improving our build system are welcome! +AIDDIR=/usr/local/AID +export PKG_CONFIG_PATH=${AIDDIR}/opencv3.3.0/lib/pkgconfig + # cuDNN acceleration switch (uncomment to build with cuDNN). # USE_CUDNN := 1 -- cgit v1.2.3