From 983ceac9f9ea9b46ea41abb5e6b85c8fdb4bf265 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Fri, 6 May 2016 16:06:15 +0530 Subject: [PATCH] dynamically compute HCC version dependency for hip_hcc package Change-Id: I5eca934826f12ee002416b299fd562db0f60056c [ROCm/hip commit: 6d2c763b268740622e3be65c79dd91c9245959d9] --- projects/hip/CMakeLists.txt | 6 +++++- projects/hip/packaging/hip_hcc.txt | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/projects/hip/CMakeLists.txt b/projects/hip/CMakeLists.txt index f16e38ca49..76b103f576 100644 --- a/projects/hip/CMakeLists.txt +++ b/projects/hip/CMakeLists.txt @@ -34,7 +34,11 @@ if(HIP_PLATFORM STREQUAL "hcc") endif() endif() if(IS_ABSOLUTE ${HCC_HOME} AND EXISTS ${HCC_HOME} AND IS_DIRECTORY ${HCC_HOME}) - message(STATUS "Looking for HCC in: " ${HCC_HOME}) + execute_process(COMMAND ${HCC_HOME}/bin/hcc --version + COMMAND cut -d\ -f9 + OUTPUT_VARIABLE HCC_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) + message(STATUS "Looking for HCC in: " ${HCC_HOME} ". Found version: " ${HCC_VERSION}) else() message(FATAL_ERROR "Don't know where to find HCC. Please specify abolute path using -DHCC_HOME") endif() diff --git a/projects/hip/packaging/hip_hcc.txt b/projects/hip/packaging/hip_hcc.txt index 0df19b325e..63637b1e0a 100644 --- a/projects/hip/packaging/hip_hcc.txt +++ b/projects/hip/packaging/hip_hcc.txt @@ -24,12 +24,12 @@ set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR} set(CPACK_GENERATOR "TGZ;DEB;RPM") set(CPACK_BINARY_DEB "ON") set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip_base (= ${CPACK_PACKAGE_VERSION}), hcc_lc (= 0.10.16155-077b4c8-d49f384)") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip_base (= ${CPACK_PACKAGE_VERSION}), hcc_lc (= @HCC_VERSION@)") set(CPACK_BINARY_RPM "ON") set(CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64") set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/postinst") set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/prerm") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") -set(CPACK_RPM_PACKAGE_REQUIRES "hip_base = ${CPACK_PACKAGE_VERSION}, hcc_lc = 0.10.16155-077b4c8-d49f384") +set(CPACK_RPM_PACKAGE_REQUIRES "hip_base = ${CPACK_PACKAGE_VERSION}, hcc_lc = @HCC_VERSION@") set(CPACK_SOURCE_GENERATOR "TGZ") include(CPack)