From a7dd25b98fa8a5770a4b024b6658d8114fd25d1a Mon Sep 17 00:00:00 2001 From: James Edwards Date: Fri, 23 Sep 2016 14:42:56 -0500 Subject: [PATCH] Update rocr packaging CMakeList.txt files to PACKAGE and LIBRARY versioning. Also, fix support for rpm packaging. Change-Id: Iff41df41ea78b7d1248164ce3f587ad34a8865a5 [ROCm/ROCR-Runtime commit: fddd5246f3fc1d2d6751fcd024040ada7677e376] --- .../packages/hsa-ext-rocr-dev/CMakeLists.txt | 80 ++++++++++------- .../packages/hsa-rocr-dev/CMakeLists.txt | 89 +++++++++++-------- 2 files changed, 99 insertions(+), 70 deletions(-) diff --git a/projects/rocr-runtime/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt b/projects/rocr-runtime/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt index 14477421ef..1b99b06693 100644 --- a/projects/rocr-runtime/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt +++ b/projects/rocr-runtime/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt @@ -56,14 +56,26 @@ endif() parse_version(${VERSION_STRING}) -set ( EXTERNAL_DIR ${CMAKE_CURRENT_BINARY_DIR} ) +set ( PACKAGE_VERSION_MAJOR ${VERSION_MAJOR} ) +set ( PACKAGE_VERSION_MINOR ${VERSION_MINOR} ) +set ( PACKAGE_VERSION_PATCH ${VERSION_PATCH} ) + +if(NOT DEFINED RUNTIME_VERSION_STRING) + set (RUNTIME_VERSION_STRING "1.0.0") +endif () + +parse_version(${RUNTIME_VERSION_STRING}) + +set ( RUNTIME_VERSION_MAJOR ${VERSION_MAJOR} ) +set ( RUNTIME_VERSION_MINOR ${VERSION_MINOR} ) +set ( RUNTIME_VERSION_PATCH ${VERSION_PATCH} ) set ( PACKAGE_DIRECTORIES "bin" "hsa/bin" "hsa/lib") -add_custom_command(OUTPUT ${PACKAGE_DIRECTORIES} WORKING_DIRECTORY ${EXTERNAL_DIR} +add_custom_command(OUTPUT ${PACKAGE_DIRECTORIES} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND mkdir -p bin COMMAND mkdir -p hsa/lib COMMAND mkdir -p hsa/bin ) @@ -76,56 +88,56 @@ set ( IMAGE_NAME "libhsa-ext-image64" ) set ( AMDHSACOD_NAME "amdhsacod" ) set ( AMDHSAFIN_NAME "amdhsafin" ) -set ( FINALIZER_LIBRARY_SOURCE "${OUT_DIR}/lib/${FINALIZER_NAME}.so.${VERSION_STRING}" ) -set ( TOOLS_LIBRARY_SOURCE "${OUT_DIR}/lib/${TOOLS_NAME}.so.${VERSION_STRING}" ) -set ( IMAGE_LIBRARY_SOURCE "${OUT_DIR}/lib/${IMAGE_NAME}.so.${VERSION_STRING}" ) +set ( FINALIZER_LIBRARY_SOURCE "${OUT_DIR}/lib/${FINALIZER_NAME}.so.${RUNTIME_VERSION_STRING}" ) +set ( TOOLS_LIBRARY_SOURCE "${OUT_DIR}/lib/${TOOLS_NAME}.so.${RUNTIME_VERSION_STRING}" ) +set ( IMAGE_LIBRARY_SOURCE "${OUT_DIR}/lib/${IMAGE_NAME}.so.${RUNTIME_VERSION_STRING}" ) set ( AMDHSACOD_SOURCE "${OUT_DIR}/bin/${AMDHSACOD_NAME}" ) set ( AMDHSAFIN_SOURCE "${OUT_DIR}/bin/${AMDHSAFIN_NAME}" ) -set ( FINALIZER_LIBRARY_TARGET "${EXTERNAL_DIR}/hsa/lib/${FINALIZER_NAME}.so.${VERSION_STRING}" ) -set ( TOOLS_LIBRARY_TARGET "${EXTERNAL_DIR}/hsa/lib/${TOOLS_NAME}.so.${VERSION_STRING}" ) -set ( IMAGE_LIBRARY_TARGET "${EXTERNAL_DIR}/hsa/lib/${IMAGE_NAME}.so.${VERSION_STRING}" ) -set ( AMDHSACOD_TARGET "${EXTERNAL_DIR}/hsa/bin/${AMDHSACOD_NAME}" ) -set ( AMDHSAFIN_TARGET "${EXTERNAL_DIR}/hsa/bin/${AMDHSAFIN_NAME}" ) +set ( FINALIZER_LIBRARY_TARGET "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${FINALIZER_NAME}.so.${RUNTIME_VERSION_STRING}" ) +set ( TOOLS_LIBRARY_TARGET "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${TOOLS_NAME}.so.${RUNTIME_VERSION_STRING}" ) +set ( IMAGE_LIBRARY_TARGET "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${IMAGE_NAME}.so.${RUNTIME_VERSION_STRING}" ) +set ( AMDHSACOD_TARGET "${CMAKE_CURRENT_BINARY_DIR}/hsa/bin/${AMDHSACOD_NAME}" ) +set ( AMDHSAFIN_TARGET "${CMAKE_CURRENT_BINARY_DIR}/hsa/bin/${AMDHSAFIN_NAME}" ) -set ( FINALIZER_LIBRARY_SONAME "${EXTERNAL_DIR}/hsa/lib/${FINALIZER_NAME}.so.1" ) -set ( TOOLS_LIBRARY_SONAME "${EXTERNAL_DIR}/hsa/lib/${TOOLS_NAME}.so.1" ) -set ( IMAGE_LIBRARY_SONAME "${EXTERNAL_DIR}/hsa/lib/${IMAGE_NAME}.so.1" ) -set ( AMDHSACOD_LINK "${EXTERNAL_DIR}/bin/${AMDHSACOD_NAME}" ) -set ( AMDHSAFIN_LINK "${EXTERNAL_DIR}/bin/${AMDHSAFIN_NAME}" ) +set ( FINALIZER_LIBRARY_SONAME "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${FINALIZER_NAME}.so.${RUNTIME_VERSION_MAJOR}" ) +set ( TOOLS_LIBRARY_SONAME "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${TOOLS_NAME}.so.${RUNTIME_VERSION_MAJOR}" ) +set ( IMAGE_LIBRARY_SONAME "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${IMAGE_NAME}.so.${RUNTIME_VERSION_MAJOR}" ) +set ( AMDHSACOD_LINK "${CMAKE_CURRENT_BINARY_DIR}/bin/${AMDHSACOD_NAME}" ) +set ( AMDHSAFIN_LINK "${CMAKE_CURRENT_BINARY_DIR}/bin/${AMDHSAFIN_NAME}" ) -add_custom_command(OUTPUT ${FINALIZER_LIBRARY_TARGET} WORKING_DIRECTORY ${EXTERNAL_DIR} +add_custom_command(OUTPUT ${FINALIZER_LIBRARY_TARGET} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${FINALIZER_LIBRARY_SOURCE} ${FINALIZER_LIBRARY_TARGET}) -add_custom_command(OUTPUT ${TOOLS_LIBRARY_TARGET} WORKING_DIRECTORY ${EXTERNAL_DIR} +add_custom_command(OUTPUT ${TOOLS_LIBRARY_TARGET} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${TOOLS_LIBRARY_SOURCE} ${TOOLS_LIBRARY_TARGET}) -add_custom_command(OUTPUT ${IMAGE_LIBRARY_TARGET} WORKING_DIRECTORY ${EXTERNAL_DIR} +add_custom_command(OUTPUT ${IMAGE_LIBRARY_TARGET} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${IMAGE_LIBRARY_SOURCE} ${IMAGE_LIBRARY_TARGET}) -add_custom_command(OUTPUT ${AMDHSACOD_TARGET} WORKING_DIRECTORY ${EXTERNAL_DIR} +add_custom_command(OUTPUT ${AMDHSACOD_TARGET} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${AMDHSACOD_SOURCE} ${AMDHSACOD_TARGET}) -add_custom_command(OUTPUT ${AMDHSAFIN_TARGET} WORKING_DIRECTORY ${EXTERNAL_DIR} +add_custom_command(OUTPUT ${AMDHSAFIN_TARGET} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${AMDHSAFIN_SOURCE} ${AMDHSAFIN_TARGET}) -add_custom_command(OUTPUT ${FINALIZER_LIBRARY_SONAME} WORKING_DIRECTORY ${EXTERNAL_DIR}/hsa/lib - COMMAND ${CMAKE_COMMAND} -E create_symlink ${FINALIZER_NAME}.so.${VERSION_STRING} ${FINALIZER_NAME}.so.1 ) +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} ) -add_custom_command(OUTPUT ${TOOLS_LIBRARY_SONAME} WORKING_DIRECTORY ${EXTERNAL_DIR}/hsa/lib - COMMAND ${CMAKE_COMMAND} -E create_symlink ${TOOLS_NAME}.so.${VERSION_STRING} ${TOOLS_NAME}.so.1 ) +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} ) -add_custom_command(OUTPUT ${IMAGE_LIBRARY_SONAME} WORKING_DIRECTORY ${EXTERNAL_DIR}/hsa/lib - COMMAND ${CMAKE_COMMAND} -E create_symlink ${IMAGE_NAME}.so.${VERSION_STRING} ${IMAGE_NAME}.so.1 ) +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} ) -add_custom_command(OUTPUT ${AMDHSACOD_LINK} WORKING_DIRECTORY ${EXTERNAL_DIR}/bin +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} ) -add_custom_command(OUTPUT ${AMDHSAFIN_LINK} WORKING_DIRECTORY ${EXTERNAL_DIR}/bin +add_custom_command(OUTPUT ${AMDHSAFIN_LINK} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/bin/${AMDHSAFIN_NAME} ${AMDHSAFIN_NAME} ) add_custom_target (copy_targets ALL DEPENDS create_dirs - ${FINALIZER_LIBRARY_TARGET} + ${FINALIZER_LIBRARY_TARGET} ${TOOLS_LIBRARY_TARGET} ${IMAGE_LIBRARY_TARGET} ${AMDHSACOD_TARGET} @@ -137,14 +149,14 @@ add_custom_target (copy_targets ALL DEPENDS create_dirs ${AMDHSAFIN_LINK} ) -install (DIRECTORY ${EXTERNAL_DIR}/bin/ DESTINATION bin USE_SOURCE_PERMISSIONS ) -install (DIRECTORY ${EXTERNAL_DIR}/hsa/ DESTINATION hsa USE_SOURCE_PERMISSIONS ) +install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin/ DESTINATION bin USE_SOURCE_PERMISSIONS ) +install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hsa/ DESTINATION hsa USE_SOURCE_PERMISSIONS ) set ( CPACK_PACKAGE_NAME ${PROJECT_NAME} ) set ( CPACK_PACKAGE_VENDOR "AMD" ) -set ( CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR} ) -set ( CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR} ) -set ( CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH} ) +set ( CPACK_PACKAGE_VERSION_MAJOR ${PACKAGE_VERSION_MAJOR} ) +set ( CPACK_PACKAGE_VERSION_MINOR ${PACKAGE_VERSION_MINOR} ) +set ( CPACK_PACKAGE_VERSION_PATCH ${PACKAGE_VERSION_PATCH} ) set ( CPACK_PACKAGE_CONTACT "James Edwards (JamesAdrian.Edwards@amd.com)" ) set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "AMD Heterogeneous System Architecture HSA - Linux HSA Runtime extensions for Boltzmann (ROCm) platforms" ) set ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/description" ) diff --git a/projects/rocr-runtime/runtime/packages/hsa-rocr-dev/CMakeLists.txt b/projects/rocr-runtime/runtime/packages/hsa-rocr-dev/CMakeLists.txt index c33dae2728..42176cc115 100644 --- a/projects/rocr-runtime/runtime/packages/hsa-rocr-dev/CMakeLists.txt +++ b/projects/rocr-runtime/runtime/packages/hsa-rocr-dev/CMakeLists.txt @@ -56,18 +56,40 @@ endif() parse_version(${VERSION_STRING}) -set ( EXTERNAL_DIR ${CMAKE_CURRENT_BINARY_DIR} ) +set ( PROJECT_VERSION_MAJOR ${VERSION_MAJOR} ) +set ( PROJECT_VERSION_MINOR ${VERSION_MINOR} ) +set ( PROJECT_VERSION_PATCH ${VERSION_PATCH} ) + +if(NOT DEFINED RUNTIME_VERSION_STRING) + set (RUNTIME_VERSION_STRING "1.0.0") +endif () + +parse_version(${RUNTIME_VERSION_STRING}) + +set ( RUNTIME_VERSION_MAJOR ${VERSION_MAJOR} ) +set ( RUNTIME_VERSION_MINOR ${VERSION_MINOR} ) +set ( RUNTIME_VERSION_PATCH ${VERSION_PATCH} ) + +if(NOT DEFINED HSAKMT_VERSION_STRING) + set (HSAKMT_VERSION_STRING "2.0.1") +endif () + +parse_version(${HSAKMT_VERSION_STRING}) + +set ( HSAKMT_VERSION_MAJOR ${VERSION_MAJOR} ) +set ( HSAKMT_VERSION_MINOR ${VERSION_MINOR} ) +set ( HSAKMT_VERSION_PATCH ${VERSION_PATCH} ) set ( RUNTIME_NAME "libhsa-runtime64" ) -set ( RUNTIME_LIBRARY_SOURCE "${OUT_DIR}/lib/${RUNTIME_NAME}.so.${VERSION_STRING}" ) -set ( RUNTIME_LIBRARY_TARGET "${EXTERNAL_DIR}/hsa/lib/${RUNTIME_NAME}.so.${VERSION_STRING}" ) -set ( RUNTIME_LIBRARY_SONAME "${EXTERNAL_DIR}/hsa/lib/${RUNTIME_NAME}.so.1" ) -set ( RUNTIME_LIBRARY_LINKNAME "${EXTERNAL_DIR}/lib/${RUNTIME_NAME}.so" ) +set ( RUNTIME_LIBRARY_SOURCE "${OUT_DIR}/lib/${RUNTIME_NAME}.so.${RUNTIME_VERSION_STRING}" ) +set ( RUNTIME_LIBRARY_TARGET "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${RUNTIME_NAME}.so.${RUNTIME_VERSION_STRING}" ) +set ( RUNTIME_LIBRARY_SONAME "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${RUNTIME_NAME}.so.${RUNTIME_VERSION_MAJOR}" ) +set ( RUNTIME_LIBRARY_LINKNAME "${CMAKE_CURRENT_BINARY_DIR}/lib/${RUNTIME_NAME}.so" ) set ( PACKAGE_DIRECTORIES "include" - "hsa/include" + "hsa/include/hsa" "hsa/lib") set ( RUNTIME_HEADER_NAMES @@ -93,41 +115,36 @@ set ( RUNTIME_TOOLS_HEADER_NAMES set ( RUNTIME_TOOLS_INCLUDE_DIR "${HSA_CLOSED_SOURCE_ROOT}/drivers/hsa/runtime/tools/inc" ) -set ( HSA_INCLUDE_LINK "${EXTERNAL_DIR}/hsa/include/hsa" ) +set ( TOPLEVEL_INCLUDE_LINK "${CMAKE_CURRENT_BINARY_DIR}/include/hsa" ) -set ( TOPLEVEL_INCLUDE_LINK "${EXTERNAL_DIR}/include/hsa" ) - -add_custom_command(OUTPUT ${PACKAGE_DIRECTORIES} WORKING_DIRECTORY ${EXTERNAL_DIR} +add_custom_command(OUTPUT ${PACKAGE_DIRECTORIES} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND mkdir -p include COMMAND mkdir -p lib COMMAND mkdir -p hsa/lib - COMMAND mkdir -p hsa/include ) + COMMAND mkdir -p hsa/include/hsa ) add_custom_target (create_dirs DEPENDS ${PACKAGE_DIRECTORIES} ) -add_custom_command( OUTPUT ${HSA_INCLUDE_LINK} WORKING_DIRECTORY ${EXTERNAL_DIR}/hsa/include - COMMAND ${CMAKE_COMMAND} -E create_symlink ../include hsa ) +add_custom_target (link_dirs DEPENDS create_dirs ${TOPLEVEL_INCLUDE_LINK} ) -add_custom_command( OUTPUT ${TOPLEVEL_INCLUDE_LINK} WORKING_DIRECTORY ${EXTERNAL_DIR}/include - COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include hsa ) - -add_custom_target (link_dirs DEPENDS create_dirs ${TOPLEVEL_INCLUDE_LINK} ${HSA_INCLUDE_LINK} ) - -add_custom_command( OUTPUT ${RUNTIME_LIBRARY_TARGET} WORKING_DIRECTORY ${EXTERNAL_DIR} +add_custom_command( OUTPUT ${RUNTIME_LIBRARY_TARGET} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${RUNTIME_LIBRARY_SOURCE} ${RUNTIME_LIBRARY_TARGET} ) -add_custom_command( OUTPUT ${RUNTIME_LIBRARY_SONAME} WORKING_DIRECTORY ${EXTERNAL_DIR}/hsa/lib - COMMAND ${CMAKE_COMMAND} -E create_symlink ${RUNTIME_NAME}.so.${VERSION_STRING} ${RUNTIME_NAME}.so.1 ) +add_custom_command( OUTPUT ${TOPLEVEL_INCLUDE_LINK} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include + COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa ) -add_custom_command( OUTPUT ${RUNTIME_LIBRARY_LINKNAME} WORKING_DIRECTORY ${EXTERNAL_DIR}/lib - COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${RUNTIME_NAME}.so.1 ${RUNTIME_NAME}.so ) +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} ) + +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 ) foreach ( HEADER_FILE ${RUNTIME_HEADER_NAMES} ) - set ( HEADER_TARGET "${EXTERNAL_DIR}/hsa/include/${HEADER_FILE}" ) + set ( HEADER_TARGET "${CMAKE_CURRENT_BINARY_DIR}/hsa/include/hsa/${HEADER_FILE}" ) - add_custom_command( OUTPUT ${HEADER_TARGET} WORKING_DIRECTORY ${EXTERNAL_DIR} - COMMAND ${CMAKE_COMMAND} -E copy ${OUT_DIR}/include/${HEADER_FILE} ${HEADER_TARGET} ) + add_custom_command( OUTPUT ${HEADER_TARGET} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E copy ${OUT_DIR}/include/hsa/${HEADER_FILE} ${HEADER_TARGET} ) list ( APPEND RUNTIME_HEADERS ${HEADER_TARGET} ) @@ -135,9 +152,9 @@ endforeach() foreach ( HEADER_FILE ${RUNTIME_TOOLS_HEADER_NAMES} ) - set ( HEADER_TARGET "${EXTERNAL_DIR}/hsa/include/${HEADER_FILE}" ) + set ( HEADER_TARGET "${CMAKE_CURRENT_BINARY_DIR}/hsa/include/hsa/${HEADER_FILE}" ) - add_custom_command( OUTPUT ${HEADER_TARGET} WORKING_DIRECTORY ${EXTERNAL_DIR} + add_custom_command( OUTPUT ${HEADER_TARGET} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${RUNTIME_TOOLS_INCLUDE_DIR}/${HEADER_FILE} ${HEADER_TARGET} ) list ( APPEND RUNTIME_HEADERS ${HEADER_TARGET} ) @@ -155,9 +172,9 @@ add_custom_target (copy_targets ALL DEPENDS create_dirs ) ## Install directives -install (DIRECTORY ${EXTERNAL_DIR}/include/ DESTINATION include USE_SOURCE_PERMISSIONS ) -install (DIRECTORY ${EXTERNAL_DIR}/lib/ DESTINATION lib USE_SOURCE_PERMISSIONS ) -install (DIRECTORY ${EXTERNAL_DIR}/hsa/ DESTINATION hsa USE_SOURCE_PERMISSIONS ) +install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ DESTINATION include USE_SOURCE_PERMISSIONS ) +install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib/ DESTINATION lib USE_SOURCE_PERMISSIONS ) +install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hsa/ DESTINATION hsa USE_SOURCE_PERMISSIONS ) install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/sample DESTINATION hsa USE_SOURCE_PERMISSIONS ) install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt DESTINATION hsa ) install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.md DESTINATION hsa ) @@ -165,21 +182,21 @@ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.md DESTINATION hsa ) ## Packaging directives set ( CPACK_PACKAGE_NAME ${PROJECT_NAME} ) set ( CPACK_PACKAGE_VENDOR "AMD" ) -set ( CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR} ) -set ( CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR} ) -set ( CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH} ) +set ( CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR} ) +set ( CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR} ) +set ( CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH} ) set ( CPACK_PACKAGE_CONTACT "James Edwards (JamesAdrian.Edwards@amd.com)" ) set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "AMD Heterogeneous System Architecture HSA - Linux HSA Runtime for Boltzmann (ROCm) platforms" ) set ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/description" ) set ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/copyright" ) # Debian package specific variables -set ( CPACK_DEBIAN_PACKAGE_DEPENDS "hsa-ext-rocr-dev (=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}), hsakmt-roct-dev (=2.0.0)" ) +set ( CPACK_DEBIAN_PACKAGE_DEPENDS "hsa-ext-rocr-dev (=${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}), hsakmt-roct-dev (=${HSAKMT_VERSION_STRING})" ) set ( CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/RadeonOpenCompute/ROCR-Runtime" ) set ( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst;${CMAKE_CURRENT_SOURCE_DIR}/prerm" ) # RPM package specific variables -set ( CPACK_RPM_PACKAGE_DEPENDS "hsa-ext-rocr-dev (=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}), hsakmt-roct-dev (=2.0.0)" ) +set ( CPACK_RPM_PACKAGE_DEPENDS "hsa-ext-rocr-dev (=${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}), hsakmt-roct-dev (=${HSAKMT_VERSION_STRING})" ) set ( CPACK_RPM_PRE_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/rpm_post" ) set ( CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/rpm_postun" )