From 0d392a9df07a82576d4dfa3a4377d02933bbf466 Mon Sep 17 00:00:00 2001 From: Ranjith Ramakrishnan Date: Mon, 27 Mar 2023 15:53:39 -0700 Subject: [PATCH] [HIPIFY][SWDEV-390802][build][fix] Hipify scripts and binaries path updated in hipify-clang.txt As part of SWDEV-368821, the scripts and binaries will get installed under /bin folder But the packaging txt file is referring the old path . Corrected the same. CMAKE_INSTALL_PREFIX is used by default if the DESTINATION is a relative path. Changed the DESTINATION to relative path --- CMakeLists.txt | 12 +++++++----- packaging/hipify-clang.txt | 19 ++++++++++--------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a8b6afb2..3f80a2ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,18 +124,20 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/dist" CACHE PATH ${INSTALL_PATH_DOC_STRING} FORCE) endif() -set(HIPIFY_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}) +set(HIPIFY_BIN_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/bin") -install(TARGETS hipify-clang DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) +install(TARGETS hipify-clang DESTINATION bin) +# install bin directory in CMAKE_INSTALL_PREFIX path install( - DIRECTORY ${CMAKE_SOURCE_DIR}/bin/ - DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + DIRECTORY ${CMAKE_SOURCE_DIR}/bin + DESTINATION . USE_SOURCE_PERMISSIONS PATTERN "hipify-perl" PATTERN "*.sh") +# install all folders under clang/version/ in CMAKE_INSTALL_PREFIX path install( DIRECTORY ${LLVM_DIR}/../../clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/ - DESTINATION ${CMAKE_INSTALL_PREFIX} + DESTINATION . COMPONENT clang-resource-headers FILES_MATCHING PATTERN "*.h" diff --git a/packaging/hipify-clang.txt b/packaging/hipify-clang.txt index 1ebd63bb..27dae2ef 100644 --- a/packaging/hipify-clang.txt +++ b/packaging/hipify-clang.txt @@ -1,15 +1,16 @@ cmake_minimum_required(VERSION 3.6.3) project(hipify-clang) -install(PROGRAMS @HIPIFY_INSTALL_PATH@/hipify-clang DESTINATION @CMAKE_INSTALL_BINDIR@) -install(DIRECTORY @HIPIFY_INSTALL_PATH@/include/ DESTINATION @CMAKE_INSTALL_INCLUDEDIR@/hipify) -install(PROGRAMS @HIPIFY_INSTALL_PATH@/hipify-perl DESTINATION @CMAKE_INSTALL_BINDIR@) -install(PROGRAMS @HIPIFY_INSTALL_PATH@/findcode.sh DESTINATION @CMAKE_INSTALL_LIBEXECDIR@/hipify) -install(PROGRAMS @HIPIFY_INSTALL_PATH@/finduncodep.sh DESTINATION @CMAKE_INSTALL_LIBEXECDIR@/hipify) -install(PROGRAMS @HIPIFY_INSTALL_PATH@/hipconvertinplace-perl.sh DESTINATION @CMAKE_INSTALL_BINDIR@) -install(PROGRAMS @HIPIFY_INSTALL_PATH@/hipconvertinplace.sh DESTINATION @CMAKE_INSTALL_BINDIR@) -install(PROGRAMS @HIPIFY_INSTALL_PATH@/hipexamine-perl.sh DESTINATION @CMAKE_INSTALL_BINDIR@) -install(PROGRAMS @HIPIFY_INSTALL_PATH@/hipexamine.sh DESTINATION @CMAKE_INSTALL_BINDIR@) +install(PROGRAMS @HIPIFY_BIN_INSTALL_PATH@/hipify-clang DESTINATION @CMAKE_INSTALL_BINDIR@) +install(PROGRAMS @HIPIFY_BIN_INSTALL_PATH@/hipify-perl DESTINATION @CMAKE_INSTALL_BINDIR@) +install(PROGRAMS @HIPIFY_BIN_INSTALL_PATH@/findcode.sh DESTINATION @CMAKE_INSTALL_LIBEXECDIR@/hipify) +install(PROGRAMS @HIPIFY_BIN_INSTALL_PATH@/finduncodep.sh DESTINATION @CMAKE_INSTALL_LIBEXECDIR@/hipify) +install(PROGRAMS @HIPIFY_BIN_INSTALL_PATH@/hipconvertinplace-perl.sh DESTINATION @CMAKE_INSTALL_BINDIR@) +install(PROGRAMS @HIPIFY_BIN_INSTALL_PATH@/hipconvertinplace.sh DESTINATION @CMAKE_INSTALL_BINDIR@) +install(PROGRAMS @HIPIFY_BIN_INSTALL_PATH@/hipexamine-perl.sh DESTINATION @CMAKE_INSTALL_BINDIR@) +install(PROGRAMS @HIPIFY_BIN_INSTALL_PATH@/hipexamine.sh DESTINATION @CMAKE_INSTALL_BINDIR@) +install(DIRECTORY @CMAKE_INSTALL_PREFIX@/include/ DESTINATION @CMAKE_INSTALL_INCLUDEDIR@/hipify) + set (FILE_REORG_BACKWARD_COMPATIBILITY "@FILE_REORG_BACKWARD_COMPATIBILITY@") if(FILE_REORG_BACKWARD_COMPATIBILITY) install(DIRECTORY @PROJECT_BINARY_DIR@/wrapper_dir/bin DESTINATION hip)