Merge branch 'buffer_pool' into next

2 files changed, 26 insertions, 11 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)