From 57ac399652df5e8cf4abfc2a162078ea94d8652b Mon Sep 17 00:00:00 2001 From: James Edwards Date: Thu, 16 Feb 2017 16:40:20 -0600 Subject: [PATCH] Modify packaging cmake files to use BUILD_VERSION* instead of RELEASE_VERSION*. Change-Id: I6f1b83c9faf0d40c1ac27d8998f4651341971b1b --- runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt | 6 +++--- runtime/packages/hsa-rocr-dev/CMakeLists.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt b/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt index be56905744..8b0163f129 100644 --- a/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt +++ b/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt @@ -116,13 +116,13 @@ add_custom_command ( OUTPUT ${AMDHSAFIN_TARGET} WORKING_DIRECTORY ${CMAKE_CURREN COMMAND ${CMAKE_COMMAND} -E copy ${AMDHSAFIN_SOURCE} ${AMDHSAFIN_TARGET} ) add_custom_command ( OUTPUT ${FINALIZER_LIBRARY_SONAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hsa/lib - COMMAND ${CMAKE_COMMAND} -E create_symlink ${FINALIZER_NAME}.so.${VERSION_STRING} ${FINALIZER_NAME}.so.${RUNTIME_VERSION_MAJOR} ) + COMMAND ${CMAKE_COMMAND} -E create_symlink ${FINALIZER_NAME}.so.${VERSION_STRING} ${FINALIZER_NAME}.so.${BUILD_VERSION_MAJOR} ) add_custom_command ( OUTPUT ${TOOLS_LIBRARY_SONAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hsa/lib - COMMAND ${CMAKE_COMMAND} -E create_symlink ${TOOLS_NAME}.so.${VERSION_STRING} ${TOOLS_NAME}.so.${RUNTIME_VERSION_MAJOR} ) + COMMAND ${CMAKE_COMMAND} -E create_symlink ${TOOLS_NAME}.so.${VERSION_STRING} ${TOOLS_NAME}.so.${BUILD_VERSION_MAJOR} ) add_custom_command ( OUTPUT ${IMAGE_LIBRARY_SONAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hsa/lib - COMMAND ${CMAKE_COMMAND} -E create_symlink ${IMAGE_NAME}.so.${VERSION_STRING} ${IMAGE_NAME}.so.${RUNTIME_VERSION_MAJOR} ) + COMMAND ${CMAKE_COMMAND} -E create_symlink ${IMAGE_NAME}.so.${VERSION_STRING} ${IMAGE_NAME}.so.${BUILD_VERSION_MAJOR} ) add_custom_command ( OUTPUT ${AMDHSACOD_LINK} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/bin/${AMDHSACOD_NAME} ${AMDHSACOD_NAME} ) diff --git a/runtime/packages/hsa-rocr-dev/CMakeLists.txt b/runtime/packages/hsa-rocr-dev/CMakeLists.txt index e61b9d82de..ad7daf38f7 100644 --- a/runtime/packages/hsa-rocr-dev/CMakeLists.txt +++ b/runtime/packages/hsa-rocr-dev/CMakeLists.txt @@ -118,10 +118,10 @@ add_custom_command( OUTPUT ${TOPLEVEL_INCLUDE_LINK} WORKING_DIRECTORY ${CMAKE_CU COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa ) add_custom_command( OUTPUT ${RUNTIME_LIBRARY_SONAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hsa/lib - COMMAND ${CMAKE_COMMAND} -E create_symlink ${RUNTIME_NAME}.so.${RUNTIME_VERSION_STRING} ${RUNTIME_NAME}.so.${RUNTIME_VERSION_MAJOR} ) + COMMAND ${CMAKE_COMMAND} -E create_symlink ${RUNTIME_NAME}.so.${LIB_VERSION_STRING} ${RUNTIME_NAME}.so.${BUILD_VERSION_MAJOR} ) add_custom_command( OUTPUT ${RUNTIME_LIBRARY_LINKNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib - COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${RUNTIME_NAME}.so.${RUNTIME_VERSION_MAJOR} ${RUNTIME_NAME}.so ) + COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${RUNTIME_NAME}.so.${BUILD_VERSION_MAJOR} ${RUNTIME_NAME}.so ) foreach ( HEADER_FILE ${RUNTIME_HEADER_NAMES} )