From 540fa908f6aabd0e99d99702a6d74d0c5c78136b Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 28 Feb 2019 21:32:45 -0800 Subject: [PATCH] Separate build version from library version This patch separates the build version (i.e. ROCm version) from the library version used to set the SONAME of the shared objects. This prevents the SONAME from getting bumped each time there is a new ROCm release without any change to the libhsakmt ABI. 1.0.6 was choosen as the library version since this was the last library version used prior to switching to the ROCm version numbers. Change-Id: I7c29ae84d8a362a831e804569d8147ca65155cad [ROCm/ROCR-Runtime commit: 006c2c248d84707b53b13c52f641e75ccb4c844e] --- projects/rocr-runtime/CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/projects/rocr-runtime/CMakeLists.txt b/projects/rocr-runtime/CMakeLists.txt index f30f5b7a97..ede67dcc10 100644 --- a/projects/rocr-runtime/CMakeLists.txt +++ b/projects/rocr-runtime/CMakeLists.txt @@ -47,7 +47,11 @@ get_version ( "1.0.0" ) set ( BUILD_VERSION_MAJOR ${VERSION_MAJOR} ) set ( BUILD_VERSION_MINOR ${VERSION_MINOR} ) set ( BUILD_VERSION_PATCH ${VERSION_PATCH} ) -set ( LIB_VERSION_STRING "${BUILD_VERSION_MAJOR}.${BUILD_VERSION_MINOR}.${BUILD_VERSION_PATCH}" ) + +set ( LIB_VERSION_MAJOR 1) +set ( LIB_VERSION_MINOR 0) +set ( LIB_VERSION_PATCH 6) +set ( LIB_VERSION_STRING "${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_PATCH}" ) if ( DEFINED VERSION_BUILD AND NOT ${VERSION_BUILD} STREQUAL "" ) message ( "VERSION BUILD DEFINED ${VERSION_BUILD}" ) @@ -73,7 +77,7 @@ endif () set ( HSAKMT_LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/src/libhsakmt.ver" ) ## Linker Flags -set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--version-script=${HSAKMT_LINKER_SCRIPT} -Wl,-soname=${HSAKMT_COMPONENT}.so.$(PROJECT_VERSION_MAJOR) -Wl,-z,nodelete -Wl,-no-undefined" ) +set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--version-script=${HSAKMT_LINKER_SCRIPT} -Wl,-soname=${HSAKMT_COMPONENT}.so.${LIB_VERSION_MAJOR} -Wl,-z,nodelete -Wl,-no-undefined" ) ## Source files set ( HSAKMT_SRC "src/debug.c" @@ -100,7 +104,7 @@ add_library ( ${HSAKMT_TARGET} SHARED ${HSAKMT_SRC} ) ## Set the VERSION and SOVERSION values set_property ( TARGET ${HSAKMT_TARGET} PROPERTY VERSION "${LIB_VERSION_STRING}" ) -set_property ( TARGET ${HSAKMT_TARGET} PROPERTY SOVERSION "${BUILD_VERSION_MAJOR}" ) +set_property ( TARGET ${HSAKMT_TARGET} PROPERTY SOVERSION "${LIB_VERSION_MAJOR}" ) find_package(PkgConfig) pkg_check_modules(PC_LIBPCI REQUIRED libpci)