Skip to content

Commit d371931

Browse files
committed
cmake: remove unused if(XMLTO_FOUND) in tools dir
This codepath should not be hit, as XMLTO is required to be defined if BUILD_TOOLS_DOCS is set (it should error-our earlier in CMake. Signed-off-by: GitHub <noreply@github.com>
1 parent 633d5fd commit d371931

File tree

1 file changed

+29
-34
lines changed

1 file changed

+29
-34
lines changed

tools/CMakeLists.txt

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -41,42 +41,37 @@ install(TARGETS amqp-publish amqp-get amqp-consume amqp-declare-queue amqp-delet
4141
COMPONENT rabbitmq-c-tools)
4242

4343
if (BUILD_TOOLS_DOCS)
44-
if (XMLTO_FOUND)
45-
set(DOCS_SRCS
46-
doc/amqp-consume.xml
47-
doc/amqp-declare-queue.xml
48-
doc/amqp-delete-queue.xml
49-
doc/amqp-get.xml
50-
doc/amqp-publish.xml
51-
doc/librabbitmq-tools.xml
52-
)
53-
54-
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc)
55-
set(XMLTO_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/doc/man-date.ent)
56-
STRING(TIMESTAMP BUILD_DATE "%Y-%m-%d" UTC)
57-
add_custom_command(
58-
OUTPUT ${XMLTO_DEPENDS}
59-
COMMAND echo ${BUILD_DATE} > ${XMLTO_DEPENDS}
60-
VERBATIM
61-
)
44+
set(DOCS_SRCS
45+
doc/amqp-consume.xml
46+
doc/amqp-declare-queue.xml
47+
doc/amqp-delete-queue.xml
48+
doc/amqp-get.xml
49+
doc/amqp-publish.xml
50+
doc/librabbitmq-tools.xml
51+
)
6252

63-
set(XMLTO_COMMAND_ARGS --skip-validation --searchpath "${CMAKE_CURRENT_BINARY_DIR}/doc")
53+
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc)
54+
set(XMLTO_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/doc/man-date.ent)
55+
STRING(TIMESTAMP BUILD_DATE "%Y-%m-%d" UTC)
56+
add_custom_command(
57+
OUTPUT ${XMLTO_DEPENDS}
58+
COMMAND echo ${BUILD_DATE} > ${XMLTO_DEPENDS}
59+
VERBATIM
60+
)
6461

65-
XMLTO(${DOCS_SRCS}
66-
MODES man
67-
ALL)
62+
set(XMLTO_COMMAND_ARGS --skip-validation --searchpath "${CMAKE_CURRENT_BINARY_DIR}/doc")
6863

69-
foreach(file ${XMLTO_FILES_man})
70-
get_filename_component(fileExt ${file} EXT)
71-
string( REGEX REPLACE "^[.]" "" fileExt ${fileExt} )
72-
install(
73-
FILES ${file}
74-
DESTINATION ${CMAKE_INSTALL_MANDIR}/man${fileExt}
75-
COMPONENT rabbitmq-c-tool-docs
76-
)
77-
endforeach()
64+
XMLTO(${DOCS_SRCS}
65+
MODES man
66+
ALL)
7867

79-
else(XMLTO_FOUND)
80-
message(WARNING "xmlto not found, will not build tools documentation")
81-
endif(XMLTO_FOUND)
68+
foreach(file ${XMLTO_FILES_man})
69+
get_filename_component(fileExt ${file} EXT)
70+
string( REGEX REPLACE "^[.]" "" fileExt ${fileExt} )
71+
install(
72+
FILES ${file}
73+
DESTINATION ${CMAKE_INSTALL_MANDIR}/man${fileExt}
74+
COMPONENT rabbitmq-c-tool-docs
75+
)
76+
endforeach()
8277
endif()

0 commit comments

Comments
 (0)