aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/CMakeLists.txt
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2016-06-14 10:22:10 -0700
committerNicholas Corgan <nick.corgan@ettus.com>2016-06-14 16:20:46 -0700
commit0b2f56bdd6b0a7dd52f795663f921061af192e6a (patch)
tree3983c755b6e40851afbd03c9891422978456a975 /host/lib/CMakeLists.txt
parent8cde538c6df89d9e7b2bdd7b8def9044f638fb60 (diff)
downloaduhd-0b2f56bdd6b0a7dd52f795663f921061af192e6a.tar.gz
uhd-0b2f56bdd6b0a7dd52f795663f921061af192e6a.tar.bz2
uhd-0b2f56bdd6b0a7dd52f795663f921061af192e6a.zip
Changing UHD's versioning system
* Version numbers now Major.API.ABI.Patch
Diffstat (limited to 'host/lib/CMakeLists.txt')
-rw-r--r--host/lib/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index a7a1cea3b..d6e2ec2cd 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -138,6 +138,7 @@ ENDIF(ENABLE_C_API)
# Add DLL resource file to Windows build
########################################################################
IF(MSVC)
+ MATH(EXPR TRIMMED_VERSION_MAJOR_API "${TRIMMED_VERSION_MAJOR} * 1000 + ${TRIMMED_VERSION_API}")
SET(RC_TRIMMED_VERSION_PATCH ${TRIMMED_VERSION_PATCH})
IF(UHD_VERSION_DEVEL)
SET(RC_TRIMMED_VERSION_PATCH "999")
@@ -174,7 +175,7 @@ TARGET_LINK_LIBRARIES(uhd ${Boost_LIBRARIES} ${libuhd_libs})
SET_TARGET_PROPERTIES(uhd PROPERTIES DEFINE_SYMBOL "UHD_DLL_EXPORTS")
IF(NOT LIBUHDDEV_PKG)
SET_TARGET_PROPERTIES(uhd PROPERTIES SOVERSION "${UHD_VERSION_MAJOR}")
- SET_TARGET_PROPERTIES(uhd PROPERTIES VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}")
+ SET_TARGET_PROPERTIES(uhd PROPERTIES VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_API}")
ENDIF(NOT LIBUHDDEV_PKG)
IF(DEFINED LIBUHD_OUTPUT_NAME)
SET_TARGET_PROPERTIES(uhd PROPERTIES OUTPUT_NAME ${LIBUHD_OUTPUT_NAME})