From ad22b072bc7b8ae7123a4cbefbab1855d3e305b8 Mon Sep 17 00:00:00 2001
From: Christoph Gysin <christoph.gysin@gmail.com>
Date: Wed, 2 Dec 2015 07:04:24 +0200
Subject: [PATCH 1/2] cmake: fix indentation
---
CMake/Manpage.cmake | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/CMake/Manpage.cmake b/CMake/Manpage.cmake
index 4842387ef..9e178a2f1 100644
--- a/CMake/Manpage.cmake
+++ b/CMake/Manpage.cmake
@@ -4,28 +4,28 @@ add_custom_target(man ALL)
function(add_manpage name section)
add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}
- COMMAND ${A2X_COMMAND}
- --no-xmllint
- --doctype manpage
- --format manpage
- -D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
- ${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt
- COMMENT Generating manpage for ${name}.${section}
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}
+ COMMAND ${A2X_COMMAND}
+ --no-xmllint
+ --doctype manpage
+ --format manpage
+ -D ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+ ${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt
+ COMMENT Generating manpage for ${name}.${section}
)
add_custom_target(man-${name}.${section}
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}
)
add_dependencies(man
man-${name}.${section}
)
install(
- FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}.${section}
- DESTINATION share/man/man${section}
- COMPONENT documentation
+ FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}.${section}
+ DESTINATION share/man/man${section}
+ COMPONENT documentation
)
endfunction()
From 6ce4bba6eb07be46ccf6531de1750451b5902d0b Mon Sep 17 00:00:00 2001
From: Christoph Gysin <christoph.gysin@gmail.com>
Date: Wed, 2 Dec 2015 07:10:50 +0200
Subject: [PATCH 2/2] cmake: fix manpage dependencies
fixes #289
---
CMake/Manpage.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMake/Manpage.cmake b/CMake/Manpage.cmake
index 9e178a2f1..e5503760b 100644
--- a/CMake/Manpage.cmake
+++ b/CMake/Manpage.cmake
@@ -4,7 +4,7 @@ add_custom_target(man ALL)
function(add_manpage name section)
add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}
+ OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}.${section}
COMMAND ${A2X_COMMAND}
--no-xmllint
--doctype manpage
@@ -17,7 +17,7 @@ function(add_manpage name section)
add_custom_target(man-${name}.${section}
DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/${name}.${section}
+ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}.${section}
)
add_dependencies(man
man-${name}.${section}