[arrayfire] 09/12: Use cmake options to inject documentation and example install paths.

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/sid
in repository arrayfire.

commit de0b4b780e696fffd40e6893419e3b653bb4974c
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Sun Nov 22 17:12:58 2015 +0000

    Use cmake options to inject documentation and example install paths.
---
 debian/libarrayfire-doc.install               |  3 +-
 debian/patches/Fix-documentation-target.patch | 57 +++++++++++++++++++++++++++
 debian/patches/Fix-examples-target.patch      | 25 ++++++++++++
 debian/patches/series                         |  2 +
 debian/rules                                  |  2 +
 5 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/debian/libarrayfire-doc.install b/debian/libarrayfire-doc.install
index b279dd9..fa5913e 100644
--- a/debian/libarrayfire-doc.install
+++ b/debian/libarrayfire-doc.install
@@ -1,2 +1 @@
-usr/share/ArrayFire/doc/* usr/share/doc/libarrayfire-doc/html
-usr/share/ArrayFire/examples/* usr/share/doc/libarrayfire-doc/examples
+usr/share/doc/libarrayfire-doc
diff --git a/debian/patches/Fix-documentation-target.patch b/debian/patches/Fix-documentation-target.patch
new file mode 100644
index 0000000..3702fc0
--- /dev/null
+++ b/debian/patches/Fix-documentation-target.patch
@@ -0,0 +1,57 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Sun, 22 Nov 2015 17:04:59 +0000
+Subject: Fix documentation target.
+
+---
+ docs/CMakeLists.txt | 9 +++------
+ docs/doxygen.mk     | 4 ++--
+ 2 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index ec7f384..fbc02e1 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -21,18 +21,15 @@ CONFIGURE_FILE(${AF_DOCS_LAYOUT} ${AF_DOCS_LAYOUT_OUT})
+ ADD_CUSTOM_TARGET(docs
+     ALL
+     COMMAND ${DOXYGEN_EXECUTABLE} ${AF_DOCS_CONFIG_OUT}
+-    COMMAND cmake -E copy_directory ${ASSETS_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+-    COMMAND cmake -E remove ${CMAKE_CURRENT_BINARY_DIR}/.git
++    COMMAND cmake -E copy_directory ${ASSETS_DIR} ${CMAKE_CURRENT_BINARY_DIR}/html
+     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+     COMMENT "Generating Documentation"
+     VERBATIM)
+ 
+ # Install Doxygen documentation
+-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ DESTINATION ${AF_INSTALL_DOC_DIR}
++INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${AF_INSTALL_DOC_DIR}
+     COMPONENT documentation
+-    PATTERN "*"
+-    PATTERN "CMakeFiles" EXCLUDE
+-    PATTERN "man" EXCLUDE
++    PATTERN ".git" EXCLUDE
+ )
+ 
+ # Install man pages
+diff --git a/docs/doxygen.mk b/docs/doxygen.mk
+index 1a1a266..2c64c41 100644
+--- a/docs/doxygen.mk
++++ b/docs/doxygen.mk
+@@ -58,7 +58,7 @@ PROJECT_LOGO           = ${ASSETS_DIR}/arrayfire_logo.png
+ # entered, it will be relative to the location where doxygen was started. If
+ # left blank the current directory will be used.
+ 
+-OUTPUT_DIRECTORY       = .
++OUTPUT_DIRECTORY       = ${CMAKE_CURRENT_BINARY_DIR}
+ 
+ # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
+ # directories (in 2 levels) under the output directory of each output format and
+@@ -1039,7 +1039,7 @@ GENERATE_HTML          = YES
+ # The default directory is: html.
+ # This tag requires that the tag GENERATE_HTML is set to YES.
+ 
+-HTML_OUTPUT            = .
++HTML_OUTPUT            = html
+ 
+ # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+ # generated HTML page (for example: .htm, .php, .asp).
diff --git a/debian/patches/Fix-examples-target.patch b/debian/patches/Fix-examples-target.patch
new file mode 100644
index 0000000..19db980
--- /dev/null
+++ b/debian/patches/Fix-examples-target.patch
@@ -0,0 +1,25 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Sun, 22 Nov 2015 17:09:41 +0000
+Subject: Fix examples target.
+
+---
+ examples/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index 8b2a7b3..5bbc6be 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -130,10 +130,10 @@ else()
+   MESSAGE(STATUS "EXAMPLES: OPENCL backend is OFF. OPENCL was not found")
+ endif()
+ 
+-INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
++INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/"
+     DESTINATION "${AF_INSTALL_EXAMPLE_DIR}"
+     COMPONENT examples)
+ 
+ INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../assets/examples"
+-    DESTINATION "${AF_INSTALL_EXAMPLE_DIR}/examples/assets/"
++    DESTINATION "${AF_INSTALL_EXAMPLE_DIR}/assets/"
+ )
diff --git a/debian/patches/series b/debian/patches/series
index b0d60fa..ba828ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@ Fix-CBLAS-detection.patch
 Use-system-gtest.patch
 Use-custom-cflags-in-examples.patch
 Fix-missing-cstdio-include.patch
+Fix-documentation-target.patch
+Fix-examples-target.patch
diff --git a/debian/rules b/debian/rules
index b755978..9065b39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,8 @@ BUILDDIR = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
 CMAKE_BUILD_OPTIONS = \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DAF_INSTALL_CMAKE_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/ArrayFire \
+	-DAF_INSTALL_DOC_DIR=/usr/share/doc/libarrayfire-doc \
+	-DAF_INSTALL_EXAMPLE_DIR=/usr/share/doc/libarrayfire-doc/examples \
 	-DAF_INSTALL_INC_DIR=/usr/include \
 	-DAF_INSTALL_LIB_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
 	-DBUILD_CPU=ON \

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