[caffe] 01/16: patch: cmake-using-gnuinstalldirs

[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 7339a71b5d19203b1b9455ddf4118e2c9be1a01d
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed May 18 05:41:42 2016 +0000

    patch: cmake-using-gnuinstalldirs
---
 debian/patches/cmake-using-gnuinstalldirs | 45 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 2 files changed, 46 insertions(+)

diff --git a/debian/patches/cmake-using-gnuinstalldirs b/debian/patches/cmake-using-gnuinstalldirs
new file mode 100644
index 0000000..8305356
--- /dev/null
+++ b/debian/patches/cmake-using-gnuinstalldirs
@@ -0,0 +1,45 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -18,6 +18,7 @@
+ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
+ 
+ include(ExternalProject)
++include(GNUInstallDirs)
+ 
+ include(cmake/Utils.cmake)
+ include(cmake/Targets.cmake)
+--- a/src/caffe/CMakeLists.txt
++++ b/src/caffe/CMakeLists.txt
+@@ -29,9 +29,9 @@
+  add_subdirectory(test)
+ 
+ # ---[ Install
+-install(DIRECTORY ${Caffe_INCLUDE_DIR}/caffe DESTINATION include)
+-install(FILES ${proto_hdrs} DESTINATION include/caffe/proto)
+-install(TARGETS caffe proto EXPORT CaffeTargets DESTINATION lib)
++install(DIRECTORY ${Caffe_INCLUDE_DIR}/caffe DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++install(FILES ${proto_hdrs} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/caffe/proto)
++install(TARGETS caffe proto EXPORT CaffeTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ file(WRITE ${PROJECT_BINARY_DIR}/__init__.py)
+ list(APPEND proto_python ${PROJECT_BINARY_DIR}/__init__.py)
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -25,5 +25,5 @@
+   endif()
+ 
+   # Install
+-  install(TARGETS ${name} DESTINATION bin)
++  install(TARGETS ${name} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endforeach(source)
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -19,7 +19,7 @@
+   caffe_set_solution_folder(${name} examples)
+ 
+   # install
+-  install(TARGETS ${name} DESTINATION bin)
++  install(TARGETS ${name} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+   if(UNIX OR APPLE)
+     # Funny command to make tutorials work
diff --git a/debian/patches/series b/debian/patches/series
index 0ed6b03..88e9306 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+cmake-using-gnuinstalldirs
 fix-spelling-error

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