diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-03-13 15:18:25 -0700 |
|---|---|---|
| committer | Brent Stapleton <bstapleton@g.hmc.edu> | 2018-10-29 14:51:20 -0700 |
| commit | 7c64976e8437029a8bfab19985cc46f9e75ecbf4 (patch) | |
| tree | fc7436b294cc62358723356e41e6c3e4c68a2fa8 /host | |
| parent | 07a0e0a036a62a160b5e0385fd163f0d88f91f2e (diff) | |
| download | uhd-7c64976e8437029a8bfab19985cc46f9e75ecbf4.tar.gz uhd-7c64976e8437029a8bfab19985cc46f9e75ecbf4.tar.bz2 uhd-7c64976e8437029a8bfab19985cc46f9e75ecbf4.zip | |
cmake: Change SOVERSION and VERSION for the library files
The SOVERSION will now match the ABI string, and the VERSION matches the
full UHD version. This will allow easier parallel installation of
multiple versions of UHD.
Diffstat (limited to 'host')
| -rw-r--r-- | host/cmake/Modules/UHDVersion.cmake | 7 | ||||
| -rw-r--r-- | host/lib/CMakeLists.txt | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index fb877b770..2cee7db6f 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -131,6 +131,7 @@ ENDIF() ######################################################################## +# Define the derived version variables: IF(DEFINED UHD_VERSION) SET(UHD_VERSION "${UHD_VERSION}" CACHE STRING "Set UHD_VERSION to a custom value") ELSEIF(TRIM_UHD_VERSION STREQUAL "True") @@ -138,3 +139,9 @@ ELSEIF(TRIM_UHD_VERSION STREQUAL "True") ELSE() SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_API}.${UHD_VERSION_ABI}.${UHD_VERSION_PATCH}-${UHD_GIT_COUNT}-${UHD_GIT_HASH}") ENDIF() +IF(DEFINED UHD_ABI_VERSION) + SET(UHD_ABI_VERSION "${UHD_ABI_VERSION}" + CACHE STRING "Set UHD_ABI_VERSION to a custom value") +ELSE() + SET(UHD_ABI_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_API}.${UHD_VERSION_ABI}") +ENDIF() diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index f5539ef6f..0645a1a32 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -180,8 +180,8 @@ ADD_LIBRARY(uhd SHARED ${libuhd_sources}) 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_API}") + SET_TARGET_PROPERTIES(uhd PROPERTIES SOVERSION "${UHD_ABI_VERSION}") + SET_TARGET_PROPERTIES(uhd PROPERTIES VERSION "${UHD_ABI_VERSION}") ENDIF(NOT LIBUHDDEV_PKG) IF(DEFINED LIBUHD_OUTPUT_NAME) SET_TARGET_PROPERTIES(uhd PROPERTIES OUTPUT_NAME ${LIBUHD_OUTPUT_NAME}) |