diff options
| -rw-r--r-- | host/Modules/FindDocutils.cmake | 21 | ||||
| -rw-r--r-- | host/Modules/UHDVersion.cmake | 16 | ||||
| -rw-r--r-- | host/docs/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | host/lib/transport/CMakeLists.txt | 3 |
4 files changed, 32 insertions, 29 deletions
diff --git a/host/Modules/FindDocutils.cmake b/host/Modules/FindDocutils.cmake new file mode 100644 index 000000000..b9996f3f1 --- /dev/null +++ b/host/Modules/FindDocutils.cmake @@ -0,0 +1,21 @@ +# +# Copyright 2010 Ettus Research LLC +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +######################################################################## +FIND_PROGRAM(RST2HTML_EXECUTABLE rst2html) +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Docutils DEFAULT_MSG RST2HTML_EXECUTABLE) diff --git a/host/Modules/UHDVersion.cmake b/host/Modules/UHDVersion.cmake index fc2e2bbbd..4bd740185 100644 --- a/host/Modules/UHDVersion.cmake +++ b/host/Modules/UHDVersion.cmake @@ -28,16 +28,13 @@ SET(UHD_VERSION_PATCH 0) #Short hash of git commit ######################################################################## # Find GIT to get repo information ######################################################################## -MESSAGE(STATUS "") -MESSAGE(STATUS "Checking for git") -FIND_PROGRAM(GIT git) -IF(GIT) - MESSAGE(STATUS "Checking for git - found") +FIND_PACKAGE(Git QUIET) +IF(GIT_FOUND) #grab the git log entry for the current head EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - COMMAND ${GIT} log HEAD~..HEAD --date=raw + COMMAND ${GIT_EXECUTABLE} log HEAD~..HEAD --date=raw OUTPUT_VARIABLE _git_log OUTPUT_STRIP_TRAILING_WHITESPACE ) @@ -58,11 +55,8 @@ IF(GIT) #grab the git ref id for the current head EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - COMMAND ${GIT} rev-parse --short HEAD + COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD OUTPUT_VARIABLE _git_rev OUTPUT_STRIP_TRAILING_WHITESPACE ) SET(UHD_VERSION_PATCH ${_git_rev}) - -ELSE(GIT) - MESSAGE(STATUS "Checking for git - not found") -ENDIF(GIT) +ENDIF(GIT_FOUND) diff --git a/host/docs/CMakeLists.txt b/host/docs/CMakeLists.txt index 54e0d589c..592d66526 100644 --- a/host/docs/CMakeLists.txt +++ b/host/docs/CMakeLists.txt @@ -36,17 +36,9 @@ SET(manual_sources # Setup Manual ######################################################################## MESSAGE(STATUS "") -MESSAGE(STATUS "Checking for rst2html (docutils)") -FIND_PROGRAM(RST2HTML rst2html) -IF(RST2HTML) - MESSAGE(STATUS "Checking for rst2html (docutils) - found") - MESSAGE(STATUS " Enabled generation of HTML manual.") -ELSE(RST2HTML) - MESSAGE(STATUS "Checking for rst2html (docutils) - not found") - MESSAGE(STATUS " Disabled generation of HTML manual.") -ENDIF(RST2HTML) +FIND_PACKAGE(Docutils REQUIRED) -LIBUHD_REGISTER_COMPONENT("Manual" ENABLE_MANUAL ON "RST2HTML" OFF) +LIBUHD_REGISTER_COMPONENT("Manual" ENABLE_MANUAL ON "DOCUTILS_FOUND" OFF) IF(ENABLE_MANUAL) #setup rst2html options @@ -66,7 +58,7 @@ IF(ENABLE_MANUAL) #make the html file depend on the rst file ADD_CUSTOM_COMMAND( OUTPUT ${htmlfile} DEPENDS ${rstfile} ${stylesheet} - COMMAND ${RST2HTML} ${rstfile} ${htmlfile} ${rst2html_options} + COMMAND ${RST2HTML_EXECUTABLE} ${rstfile} ${htmlfile} ${rst2html_options} COMMENT "Generating ${htmlfile}" ) @@ -85,14 +77,11 @@ INSTALL(FILES ${manual_sources} DESTINATION ${PKG_DOC_DIR}/manual/rst) # Setup Doxygen ######################################################################## MESSAGE(STATUS "") -MESSAGE(STATUS "Checking for doxygen") -INCLUDE(FindDoxygen) +FIND_PACKAGE(Doxygen) LIBUHD_REGISTER_COMPONENT("Doxygen" ENABLE_DOXYGEN ON "DOXYGEN_FOUND" OFF) IF(ENABLE_DOXYGEN) - MESSAGE(STATUS " Enabled generation of Doxygen documentation.") - #generate the doxygen configuration file SET(CMAKE_CURRENT_BINARY_DIR_DOXYGEN ${CMAKE_CURRENT_BINARY_DIR}/doxygen) CONFIGURE_FILE( @@ -111,6 +100,4 @@ IF(ENABLE_DOXYGEN) #make the doxygen generation a built-time dependency ADD_CUSTOM_TARGET(doxygen_docs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR_DOXYGEN}) INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR_DOXYGEN} DESTINATION ${PKG_DOC_DIR}) -ELSE(ENABLE_DOXYGEN) - MESSAGE(STATUS " Disabled generation of Doxygen documentation.") ENDIF(ENABLE_DOXYGEN) diff --git a/host/lib/transport/CMakeLists.txt b/host/lib/transport/CMakeLists.txt index 5602e47a7..0d6226e4c 100644 --- a/host/lib/transport/CMakeLists.txt +++ b/host/lib/transport/CMakeLists.txt @@ -22,7 +22,8 @@ ######################################################################## # Setup libusb ######################################################################## -FIND_PACKAGE(USB1) +MESSAGE(STATUS "") +FIND_PACKAGE(USB1 REQUIRED) LIBUHD_REGISTER_COMPONENT("USB" ENABLE_USB ON "ENABLE_LIBUHD;LIBUSB_FOUND" OFF) |