[caffe] 01/02: Revert "patch: remove cmake-avoid-argument-missing"

[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.

commit d2c67cb6cb0940c1d9ff13167473825e04537370
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Sat Nov 26 05:12:55 2016 +0000

    Revert "patch: remove cmake-avoid-argument-missing"
    
    This reverts commit add832c1bc712c259d9928ffa3b3ae5d15403217.
---
 debian/changelog                            |  1 -
 debian/patches/cmake-avoid-argument-missing | 11 +++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b7c7e10..6f21ace 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,6 @@ caffe (1.0.0~rc3+20160930-ga7f950b-2) experimental; urgency=medium
   * Refresh symbols control file for the following architectures:
     + amd64 (default), i386, ppc64el, kfreebsd-{amd64,i386}.
   * Add python3-protobuf to B-D, which is available since protobuf_3.0.0-8 .
-  * Remove patch: cmake-avoid-argument-missing .
   * Add description for patch: cmake-fix-python-module-installdir .
 
  -- Zhou Mo <cdluminate at gmail.com>  Sat, 26 Nov 2016 04:24:25 +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 1665e56..4805bd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 cmake-using-basic-blas
 cmake-using-gnuinstalldirs
 cmake-fix-python-module-installdir
+cmake-avoid-argument-missing
 fix-more-float-comparison-precision-issue

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