[toulbar2] 02/03: Remove CMP0050 obsolete cmake command and get PDF refman by default

[Thomas Schiex]

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

tschiex-guest pushed a commit to branch master
in repository toulbar2.

commit a0af1b65031b713f7bd25a2306339ed72753e3d6
Author: Thomas Schiex <Thomas.Schiex at toulouse.inra.fr>
Date:   Tue May 10 21:23:11 2016 +0200

    Remove CMP0050 obsolete cmake command and get PDF refman by default
---
 debian/patches/050-remove-obsolete-cmake-commands | 21 +++++++++++++++++++++
 debian/patches/060-get-pdf-refman                 | 14 ++++++++++++++
 debian/patches/series                             |  2 ++
 3 files changed, 37 insertions(+)

diff --git a/debian/patches/050-remove-obsolete-cmake-commands b/debian/patches/050-remove-obsolete-cmake-commands
new file mode 100644
index 0000000..d60c51b
--- /dev/null
+++ b/debian/patches/050-remove-obsolete-cmake-commands
@@ -0,0 +1,21 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -421,17 +421,11 @@
+ 
+ ADD_CUSTOM_COMMAND(
+   TARGET man
+-  SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/man/toulbar2.1
++  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/man/toulbar2.1
+   COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/man/toulbar2.1 ${CMAKE_CURRENT_BINARY_DIR}/toulbar2.1
+   OUTPUTS ${CMAKE_CURRENT_BINARY_DIR}/toulbar2.1
+   )
+ 
+-ADD_CUSTOM_COMMAND(
+-  TARGET man
+-  SOURCE man
+-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/toulbar2.1
+-  )
+-
+ ###########
+ # doc install
+ ###########
diff --git a/debian/patches/060-get-pdf-refman b/debian/patches/060-get-pdf-refman
new file mode 100644
index 0000000..49fe0fd
--- /dev/null
+++ b/debian/patches/060-get-pdf-refman
@@ -0,0 +1,14 @@
+--- a/cmake-script/UseDoxygen.cmake
++++ b/cmake-script/UseDoxygen.cmake
+@@ -46,9 +46,11 @@
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/latex/refman.pdf DESTINATION ${doc_destination}/${Toulbar_NAME})
+   else()
+     set(DOXYGEN_LATEX "NO")
++    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/refman.pdf DESTINATION ${doc_destination}/${Toulbar_NAME})
+   endif()
+ else()
+   set(DOXYFILE_GENERATE_LATEX "NO")
++  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/refman.pdf DESTINATION ${doc_destination}/${Toulbar_NAME})
+ endif()
+ 
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${doc_destination}/${Toulbar_NAME})
diff --git a/debian/patches/series b/debian/patches/series
index 7db17ec..004c11c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@
 020-give-time-for-test
 030-regenerate-doxydoc-at-compile-time
 040-put-documentation-in-the-right-place
+050-remove-obsolete-cmake-commands
+060-get-pdf-refman

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