diff options
| author | Alan Antonuk <alan.antonuk@gmail.com> | 2013-01-19 22:52:44 -0500 |
|---|---|---|
| committer | Alan Antonuk <alan.antonuk@gmail.com> | 2013-01-19 22:52:44 -0500 |
| commit | 38e741b669bd1c30551c685712a272a4a3f04bfc (patch) | |
| tree | 5f0f192b18ece1609e71d0f71998dcc760d01ad9 | |
| parent | 24ffaf869b68b2fa0e61f90165b11d82fb156371 (diff) | |
| download | rabbitmq-c-github-ask-38e741b669bd1c30551c685712a272a4a3f04bfc.tar.gz | |
Fix for XmlTo not found warning in tools directory
Issue was FindPackageHandleStandardArgs upper-cases the package name
so when XmlTo was passed to the FIND_PACKAGE_HANDLE_STANDARD_ARGS
function it created the variable XMLTO_FOUND instead of the expected
XmlTo_FOUND
| -rw-r--r-- | cmake/FindXmlTo.cmake | 2 | ||||
| -rw-r--r-- | tools/CMakeLists.txt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmake/FindXmlTo.cmake b/cmake/FindXmlTo.cmake index 8f9ecc1..d2d4d63 100644 --- a/cmake/FindXmlTo.cmake +++ b/cmake/FindXmlTo.cmake @@ -10,7 +10,7 @@ find_program ( XMLTO_EXECUTABLE include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(XmlTo +FIND_PACKAGE_HANDLE_STANDARD_ARGS(XMLTO REQUIRED_VARS XMLTO_EXECUTABLE) mark_as_advanced( XMLTO_EXECUTABLE ) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 10be4df..739f0ec 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -33,7 +33,7 @@ add_executable(amqp-delete-queue delete_queue.c ${COMMON_SRCS}) target_link_libraries(amqp-delete-queue ${RMQ_LIBRARY_TARGET} ${POPT_LIBRARY}) if (BUILD_TOOLS_DOCS) - if (XmlTo_FOUND) + if (XMLTO_FOUND) set(DOCS_SRCS doc/amqp-consume.xml doc/amqp-declare-queue.xml @@ -66,9 +66,9 @@ if (BUILD_TOOLS_DOCS) ) endforeach() - else(XmlTo_FOUND) + else(XMLTO_FOUND) message(WARNING "xmlto not found, will not build tools documentation") - endif(XmlTo_FOUND) + endif(XMLTO_FOUND) endif() install(TARGETS amqp-publish amqp-get amqp-consume amqp-declare-queue amqp-delete-queue |