[caffe-contrib] 06/15: patch: import cmake-avoid-argument-missing from src:caffe

[Zhou Mo]

This is an automated email from the git hooks/post-receive script.

cdluminate-guest pushed a commit to branch master
in repository caffe-contrib.

commit 0ee3f78d7e2b5580084e269dfba5566040942a70
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Sun Oct 2 14:32:26 2016 +0000

    patch: import cmake-avoid-argument-missing from src:caffe
---
 debian/changelog                            |  4 +++-
 debian/patches/cmake-avoid-argument-missing | 11 +++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a154d96..cd662f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,9 @@ caffe-contrib (1.0.0~rc3+20160930-ga7f950b-1) UNRELEASED; urgency=medium
   * Add git and libboost-dev to make cmake happy.
   * Update package description.
   * Update txt2man template d/man/caffe.txt and its corresponding manpage.
-  * Import updated patch cmake-fix-python-module-installdir from src:caffe .
+  * Import several patches from source package "caffe" :
+    + cmake-avoid-argument-missing
+    + cmake-fix-python-module-installdir
 
  -- Zhou Mo <cdluminate at gmail.com>  Wed, 10 Aug 2016 14:08:06 +0000
 
diff --git a/debian/patches/cmake-avoid-argument-missing b/debian/patches/cmake-avoid-argument-missing
new file mode 100644
index 0000000..0a3bc96
--- /dev/null
+++ b/debian/patches/cmake-avoid-argument-missing
@@ -0,0 +1,11 @@
+--- a/cmake/ConfigGen.cmake
++++ b/cmake/ConfigGen.cmake
+@@ -92,7 +92,7 @@
+   # remove source and build dir includes
+   caffe_get_items_with_prefix(${PROJECT_SOURCE_DIR} Caffe_INCLUDE_DIRS __insource)
+   caffe_get_items_with_prefix(${PROJECT_BINARY_DIR} Caffe_INCLUDE_DIRS __inbinary)
+-  list(REMOVE_ITEM Caffe_INCLUDE_DIRS ${__insource} ${__inbinary})
++  list(REMOVE_ITEM Caffe_INCLUDE_DIRS ${__insource} ${__inbinary} "")
+ 
+   # add `install` include folder
+   set(lines
diff --git a/debian/patches/series b/debian/patches/series
index 917762d..2091e6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@ cmake-using-basic-blas
 cmake-using-gnuinstalldirs
 fix-spelling-error
 cmake-fix-python-module-installdir
+cmake-avoid-argument-missing
 
 # the following 3 patches are upstream fix for 32bit LMDB issue.
 # see https://github.com/bvlc/caffe/issues/3731

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe-contrib.git