You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gm...@apache.org on 2016/11/25 16:33:26 UTC

qpid-dispatch git commit: DISPATCH-574 - Fix build is asciidoc is not installed

Repository: qpid-dispatch
Updated Branches:
  refs/heads/master ec884dc03 -> 05dd0dda5


DISPATCH-574 - Fix build is asciidoc is not installed


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/05dd0dda
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/05dd0dda
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/05dd0dda

Branch: refs/heads/master
Commit: 05dd0dda5df9ec36d7fc2f8bc1f2425b19b40d88
Parents: ec884dc
Author: Ganesh Murthy <gm...@redhat.com>
Authored: Fri Nov 25 11:33:05 2016 -0500
Committer: Ganesh Murthy <gm...@redhat.com>
Committed: Fri Nov 25 11:33:05 2016 -0500

----------------------------------------------------------------------
 doc/CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/05dd0dda/doc/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index a655bf2..894bfc7 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -87,6 +87,9 @@ if(BUILD_DOCS)
   
   install(FILES ${bin}/book/schema.adoc DESTINATION ${QD_DOC_INSTALL_DIR})
   install(FILES ${bin}/man/qdrouterd.conf.5.adoc DESTINATION ${QD_DOC_INSTALL_DIR})
+  
+  EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_directory ${src}/book/ ${bin}/book)
+  EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_directory ${src}/man/ ${bin}/man)  
 
   find_program(ASCIIDOC_EXE asciidoc DOC "Generate HTML documentation")
   if (ASCIIDOC_EXE)
@@ -95,8 +98,6 @@ if(BUILD_DOCS)
 
     # Copy the book dir images for HTML viewing in the build directory.
     # Don't use configure_file since it truncates .png files at 1st ^Z character
-    EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_directory ${src}/book/ ${bin}/book)
-    EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_directory ${src}/man/ ${bin}/man)
     
     # Copy the images. Don't use configure_file since it truncates .png files at 1st ^Z character
     file(GLOB_RECURSE PNG_SRC RELATIVE ${src} *.png)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org