From 5d3958c97675fa7e643b4a56a11298cdbb7f13e2 Mon Sep 17 00:00:00 2001 From: Ryan Tucker Date: Sat, 26 Jul 2014 12:44:33 -0400 Subject: [PATCH 1/2] libbladeRF: clarify doxygen instructions in README --- host/libraries/libbladeRF/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/libraries/libbladeRF/README.md b/host/libraries/libbladeRF/README.md index 66e267ee..2d4a0ca9 100644 --- a/host/libraries/libbladeRF/README.md +++ b/host/libraries/libbladeRF/README.md @@ -15,7 +15,7 @@ Functionality provided by this library includes: For more information, please generate and view the doxygen documentation. From your host/build directory, run: ``` -cmake -DBUILD_DOCUMENTATION=Yes BUILD_LIBBLADERF_DOCUMENTATION=ON ../ +cmake -DBUILD_DOCUMENTATION=ON ../ make libbladeRF-doxygen ``` The HTML documentation will be placed in **\/libraries/libbladerf/doc/doxygen/html**. The **index.html** file is the "main" documentation page. From 287ac7cc03c49114aaf2c9d250d93fc0cfcbd778 Mon Sep 17 00:00:00 2001 From: Ryan Tucker Date: Sat, 26 Jul 2014 13:13:28 -0400 Subject: [PATCH 2/2] host CMake: missing deps now FATAL_ERROR (#292) In the event that BUILD_DOCUMENTATION is ON but Doxygen or help2man are missing, or in the event ENABLE_LIBTECLA is ON and libtecla is missing, raise a FATAL_ERROR and abort CMake. Since BUILD_DOCUMENTATION is OFF by default, and the existence of libtecla determines the default for ENABLE_LIBTECLA, this should have no impact for the casual "cmake .." user. --- host/libraries/libbladeRF/CMakeLists.txt | 2 +- host/utilities/bladeRF-cli/CMakeLists.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/host/libraries/libbladeRF/CMakeLists.txt b/host/libraries/libbladeRF/CMakeLists.txt index 7ee584de..17673ccf 100644 --- a/host/libraries/libbladeRF/CMakeLists.txt +++ b/host/libraries/libbladeRF/CMakeLists.txt @@ -369,6 +369,6 @@ if(BUILD_LIBBLADERF_DOCUMENTATION) add_custom_target(libbladeRF-doxygen ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/doc/doxygen/html/index.html) else(DOXYGEN_FOUND) - message(WARNING "Could not find Doxygen. libbladeRF API documentation will not be built.") + message(FATAL_ERROR "Could not find Doxygen. Unable to build libbladeRF API documentation.") endif(DOXYGEN_FOUND) endif(BUILD_LIBBLADERF_DOCUMENTATION) diff --git a/host/utilities/bladeRF-cli/CMakeLists.txt b/host/utilities/bladeRF-cli/CMakeLists.txt index be4e2880..4be4c734 100644 --- a/host/utilities/bladeRF-cli/CMakeLists.txt +++ b/host/utilities/bladeRF-cli/CMakeLists.txt @@ -78,6 +78,10 @@ endif() if(ENABLE_LIBTECLA) + if((NOT LIBTECLA_INCLUDE_DIR) OR (NOT LIBTECLA_LIBRARIES)) + message(FATAL_ERROR "ENABLE_LIBTECLA was forced ON, but libtecla cannot be found!") + endif() + message(STATUS "libtecla support enabled") endif() @@ -259,7 +263,7 @@ if(BUILD_BLADERF_CLI_DOCUMENTATION) add_custom_target(bladeRF-cli-manpage ALL DEPENDS bladeRF-cli.1) else(HELP2MAN_EXECUTABLE) - message(WARNING "Could not find help2man. bladeRF-cli man page will not be built.") + message(FATAL_ERROR "Could not find help2man. bladeRF-cli man page cannot be built.") endif(HELP2MAN_EXECUTABLE) else(BUILD_BLADERF_CLI_DOCUMENTATION) message(STATUS "Not building man page for bladeRF-cli. (BUILD_BLADERF_CLI_DOCUMENTATION is OFF)")