5 files changed, 74 insertions, 40 deletions
diff --git a/host/cmake/Modules/UHDConfigVersion.cmake.in b/host/cmake/Modules/UHDConfigVersion.cmake.in
index 549798324..c792b5bf8 100644
--- a/host/cmake/Modules/UHDConfigVersion.cmake.in
+++ b/host/cmake/Modules/UHDConfigVersion.cmake.in
@@ -29,13 +29,13 @@ set(ENV{UHD_CONFIG_VERSION_USED} TRUE)
 # version values as set in cmake/Modules/UHDVersion.cmake, placed
 # statically in here to avoid using Python all over again.
 
-SET(MAJOR_VERSION @TRIMMED_VERSION_MAJOR@)
-SET(API_VERSION @TRIMMED_VERSION_API@)
-SET(ABI_VERSION @TRIMMED_VERSION_ABI@)
-SET(PATCH_VERSION @TRIMMED_VERSION_PATCH@)
+SET(MAJOR_VERSION @UHD_VERSION_MAJOR@)
+SET(API_VERSION @UHD_VERSION_API@)
+SET(ABI_VERSION @UHD_VERSION_ABI@)
+SET(PATCH_VERSION @UHD_VERSION_PATCH@)
 SET(DEVEL_VERSION @UHD_VERSION_DEVEL@)
 
-SET(PACKAGE_VERSION @TRIMMED_UHD_VERSION@)
+SET(PACKAGE_VERSION @UHD_VERSION@)
 SET(ENV{UHD_PACKAGE_VERSION} ${PACKAGE_VERSION})
 
 # There is a bug in CMake whereby calling "find_package(FOO)" within
@@ -175,4 +175,4 @@ IF(${PACKAGE_FIND_VERSION} VERSION_EQUAL ${PACKAGE_VERSION})
 ENDIF()
 
 # Undo our patch-version-number hack
-SET(PACKAGE_VERSION @TRIMMED_UHD_VERSION@)
+SET(PACKAGE_VERSION @UHD_VERSION@)
diff --git a/host/cmake/Modules/UHDGlobalDefs.cmake b/host/cmake/Modules/UHDGlobalDefs.cmake
index 70d1a654b..ada6371fb 100644
--- a/host/cmake/Modules/UHDGlobalDefs.cmake
+++ b/host/cmake/Modules/UHDGlobalDefs.cmake
@@ -24,9 +24,9 @@ CHECK_CXX_SYMBOL_EXISTS(log2 cmath HAVE_LOG2)
 
 ## Macros for the version number
 IF(UHD_VERSION_DEVEL)
-    MATH(EXPR UHD_VERSION_ADDED "1000000 * ${TRIMMED_VERSION_MAJOR} + 10000 * ${TRIMMED_VERSION_API} + 100 * ${TRIMMED_VERSION_ABI} + 99")
+    MATH(EXPR UHD_VERSION_ADDED "1000000 * ${UHD_VERSION_MAJOR} + 10000 * ${UHD_VERSION_API} + 100 * ${UHD_VERSION_ABI} + 99")
 ELSE()
-    MATH(EXPR UHD_VERSION_ADDED "1000000 * ${TRIMMED_VERSION_MAJOR} + 10000 * ${TRIMMED_VERSION_API} + 100 * ${TRIMMED_VERSION_ABI} + ${TRIMMED_VERSION_PATCH}")
+    MATH(EXPR UHD_VERSION_ADDED "1000000 * ${UHD_VERSION_MAJOR} + 10000 * ${UHD_VERSION_API} + 100 * ${UHD_VERSION_ABI} + ${UHD_VERSION_PATCH}")
 ENDIF(UHD_VERSION_DEVEL)
 
 ## RFNoC
diff --git a/host/cmake/Modules/UHDLog.cmake b/host/cmake/Modules/UHDLog.cmake
new file mode 100644
index 000000000..d5612f1ed
--- /dev/null
+++ b/host/cmake/Modules/UHDLog.cmake
@@ -0,0 +1,57 @@
+########################################################################
+# Logging Variables
+########################################################################
+IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    SET(UHD_LOG_MIN_LEVEL "debug" CACHE STRING "Set UHD log level to {trace, debug, info, warning, error, fatal}")
+    SET(UHD_LOG_CONSOLE_DISABLE "OFF" CACHE BOOL "Disable UHD logging to stderr")
+    SET(UHD_LOG_FILE_LEVEL "trace" CACHE STRING "SET UHD file logging level to {trace, debug, info, warning, error, fatal}")
+    SET(UHD_LOG_CONSOLE_LEVEL "debug" CACHE STRING "SET UHD file logging level to {trace, debug, info, warning, error, fatal}")
+ELSE()
+    SET(UHD_LOG_MIN_LEVEL "debug" CACHE STRING "Set UHD log level to {trace, debug, info, warning, error, fatal}")
+    SET(UHD_LOG_CONSOLE_DISABLE "OFF" CACHE BOOL "Disable UHD logging to stderr")
+    SET(UHD_LOG_FILE_LEVEL "info" CACHE STRING "SET UHD file logging level to {trace, debug, info, warning, error, fatal}")
+    SET(UHD_LOG_CONSOLE_LEVEL "info" CACHE STRING "SET UHD file logging level to {trace, debug, info, warning, error, fatal}")
+ENDIF()
+
+FUNCTION(UHD_LOG_LEVEL_CONVERT ARG1 ARG2)
+    string(TOLOWER "${ARG1}" LOG_LEVEL_LOWER)
+    IF(LOG_LEVEL_LOWER STREQUAL "trace")
+        ADD_DEFINITIONS(-D${ARG2}=0)
+    ELSEIF(LOG_LEVEL_LOWER STREQUAL "debug")
+        ADD_DEFINITIONS(-D${ARG2}=1)
+    ELSEIF(LOG_LEVEL_LOWER STREQUAL "info")
+        ADD_DEFINITIONS(-D${ARG2}=2)
+    ELSEIF(LOG_LEVEL_LOWER STREQUAL "warning")
+        ADD_DEFINITIONS(-D${ARG2}=3)
+    ELSEIF(LOG_LEVEL_LOWER STREQUAL "error")
+        ADD_DEFINITIONS(-D${ARG2}=4)
+    ELSEIF(LOG_LEVEL_LOWER STREQUAL "fatal")
+        ADD_DEFINITIONS(-D${ARG2}=5)
+    ELSE()
+        ADD_DEFINITIONS(-D${ARG2}=${ARG1})
+    ENDIF()
+ENDFUNCTION()
+
+UHD_LOG_LEVEL_CONVERT(${UHD_LOG_MIN_LEVEL} "UHD_LOG_MIN_LEVEL")
+UHD_LOG_LEVEL_CONVERT(${UHD_LOG_CONSOLE_LEVEL} "UHD_LOG_CONSOLE_LEVEL")
+UHD_LOG_LEVEL_CONVERT(${UHD_LOG_FILE_LEVEL} "UHD_LOG_FILE_LEVEL")
+
+IF(UHD_LOG_CONSOLE_DISABLE)
+    ADD_DEFINITIONS(-DUHD_LOG_CONSOLE_DISABLE)
+ELSE()
+    IF(UHD_LOG_CONSOLE_TIME)
+        ADD_DEFINITIONS(-DUHD_LOG_CONSOLE_TIME)
+    ENDIF()
+    IF(UHD_LOG_CONSOLE_THREAD)
+        ADD_DEFINITIONS(-DUHD_LOG_CONSOLE_THREAD)
+    ENDIF()
+    IF(UHD_LOG_CONSOLE_SRC)
+        ADD_DEFINITIONS(-DUHD_LOG_CONSOLE_SRC)
+    ENDIF()
+ENDIF()
+
+SET(UHD_LOG_FILE "" CACHE FILE "Set UHD log file to a file in a existing directory")
+IF(NOT UHD_LOG_FILE STREQUAL "")
+    ADD_DEFINITIONS(-DUHD_LOG_FILE=${UHD_LOG_FILE})
+ENDIF()
+
diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake
index 3b8b69ab5..138abacb9 100644
--- a/host/cmake/Modules/UHDPackage.cmake
+++ b/host/cmake/Modules/UHDPackage.cmake
@@ -55,13 +55,12 @@ ENDIF()
 ########################################################################
 # Setup package file name
 ########################################################################
-
 IF(DEBIAN AND LIBUHD_PKG)
-    SET(CPACK_PACKAGE_FILE_NAME "libuhd${UHD_VERSION_MAJOR}_${TRIMMED_UHD_VERSION}_${CMAKE_SYSTEM_PROCESSOR}" CACHE INTERNAL "")
+    SET(CPACK_PACKAGE_FILE_NAME "libuhd${UHD_VERSION_MAJOR}_${UHD_VERSION}_${CMAKE_SYSTEM_PROCESSOR}" CACHE INTERNAL "")
 ELSEIF(DEBIAN AND LIBUHDDEV_PKG)
-    SET(CPACK_PACKAGE_FILE_NAME "libuhd-dev_${TRIMMED_UHD_VERSION}_${CMAKE_SYSTEM_PROCESSOR}" CACHE INTERNAL "")
+    SET(CPACK_PACKAGE_FILE_NAME "libuhd-dev_${UHD_VERSION}_${CMAKE_SYSTEM_PROCESSOR}" CACHE INTERNAL "")
 ELSEIF(DEBIAN AND UHDHOST_PKG)
-    SET(CPACK_PACKAGE_FILE_NAME "uhd-host_${TRIMMED_UHD_VERSION}_${CMAKE_SYSTEM_PROCESSOR}" CACHE INTERNAL "")
+    SET(CPACK_PACKAGE_FILE_NAME "uhd-host_${UHD_VERSION}_${CMAKE_SYSTEM_PROCESSOR}" CACHE INTERNAL "")
 ELSE()
     IF(DEBIAN OR REDHAT)
         FIND_PROGRAM(LSB_RELEASE_EXECUTABLE lsb_release)
@@ -124,7 +123,7 @@ SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
 # Setup CPack Source
 ########################################################################
 
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME "uhd-${TRIMMED_UHD_VERSION}" CACHE INTERNAL "")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "uhd-${UHD_VERSION}" CACHE INTERNAL "")
 SET(CPACK_SOURCE_IGNORE_FILES "\\\\.git*;\\\\.swp$")
 
 ########################################################################
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake
index 79ba2d017..0e8064ff3 100644
--- a/host/cmake/Modules/UHDVersion.cmake
+++ b/host/cmake/Modules/UHDVersion.cmake
@@ -27,11 +27,11 @@ FIND_PACKAGE(Git QUIET)
 #  - Increment patch for bugfixes and docs
 #  - set UHD_VERSION_DEVEL to true for master and development branches
 ########################################################################
-SET(UHD_VERSION_MAJOR 003)
-SET(UHD_VERSION_API   010)
-SET(UHD_VERSION_ABI   001)
-SET(UHD_VERSION_PATCH 001)
-SET(UHD_VERSION_DEVEL FALSE)
+SET(UHD_VERSION_MAJOR   3)
+SET(UHD_VERSION_API    11)
+SET(UHD_VERSION_ABI     0)
+SET(UHD_VERSION_PATCH git)
+SET(UHD_VERSION_DEVEL TRUE)
 
 ########################################################################
 # If we're on a development branch, we skip the patch version
@@ -74,28 +74,6 @@ IF(GIT_FOUND)
 ENDIF(GIT_FOUND)
 
 ########################################################################
-# Set up trimmed version numbers for DLL resource files and packages
-########################################################################
-FUNCTION(DEPAD_NUM input_num output_num)
-    EXECUTE_PROCESS(
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        COMMAND ${PYTHON_EXECUTABLE} -c "print(\"${input_num}\".lstrip(\"0\") or 0)"
-        OUTPUT_VARIABLE depadded_num OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    SET(${output_num} ${depadded_num} PARENT_SCOPE)
-ENDFUNCTION(DEPAD_NUM)
-
-DEPAD_NUM(${UHD_VERSION_MAJOR} TRIMMED_VERSION_MAJOR)
-DEPAD_NUM(${UHD_VERSION_API}   TRIMMED_VERSION_API)
-DEPAD_NUM(${UHD_VERSION_ABI}   TRIMMED_VERSION_ABI)
-IF(UHD_VERSION_DEVEL)
-    SET(TRIMMED_VERSION_PATCH ${UHD_VERSION_PATCH})
-ELSE(UHD_VERSION_DEVEL)
-    DEPAD_NUM(${UHD_VERSION_PATCH} TRIMMED_VERSION_PATCH)
-ENDIF(UHD_VERSION_DEVEL)
-SET(TRIMMED_UHD_VERSION "${TRIMMED_VERSION_MAJOR}.${TRIMMED_VERSION_API}.${TRIMMED_VERSION_ABI}.${TRIMMED_VERSION_PATCH}")
-
-########################################################################
 # Version information discovery through git log
 ########################################################################