From bafc0a045cbea2bb2e5aee9c4f95855bb6fde8d3 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 28 Oct 2016 13:54:45 -0700 Subject: cmake: Remove duplicate definitions of UHD_VERSION --- host/cmake/Modules/UHDGlobalDefs.cmake | 1 - host/include/config.h.in | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'host') diff --git a/host/cmake/Modules/UHDGlobalDefs.cmake b/host/cmake/Modules/UHDGlobalDefs.cmake index 167861402..70d1a654b 100644 --- a/host/cmake/Modules/UHDGlobalDefs.cmake +++ b/host/cmake/Modules/UHDGlobalDefs.cmake @@ -28,7 +28,6 @@ IF(UHD_VERSION_DEVEL) ELSE() MATH(EXPR UHD_VERSION_ADDED "1000000 * ${TRIMMED_VERSION_MAJOR} + 10000 * ${TRIMMED_VERSION_API} + 100 * ${TRIMMED_VERSION_ABI} + ${TRIMMED_VERSION_PATCH}") ENDIF(UHD_VERSION_DEVEL) -ADD_DEFINITIONS(-DUHD_VERSION=${UHD_VERSION_ADDED}) ## RFNoC IF(ENABLE_RFNOC) diff --git a/host/include/config.h.in b/host/include/config.h.in index 8931d6580..8e72a1f00 100644 --- a/host/include/config.h.in +++ b/host/include/config.h.in @@ -23,4 +23,6 @@ #cmakedefine UHD_VERSION_ABI ${TRIMMED_VERSION_ABI} #cmakedefine UHD_VERSION_PATCH ${TRIMMED_VERSION_PATCH} #cmakedefine ENABLE_USB +#ifndef UHD_VERSION #cmakedefine UHD_VERSION @UHD_VERSION_ADDED@ +#endif -- cgit v1.2.3