Skip to content

Commit

Permalink
[HIPIFY][SWDEV-390802][build][fix] Hipify scripts and binaries path u…
Browse files Browse the repository at this point in the history
…pdated in hipify-clang.txt

As part of SWDEV-368821, the scripts and binaries will get installed under <Install_Prefix>/bin folder
But the packaging txt file is referring the old path <Install_Prefix>. Corrected the same.
CMAKE_INSTALL_PREFIX is used by default if the DESTINATION is a relative path.
Changed the DESTINATION to relative path
  • Loading branch information
raramakr committed Mar 27, 2023
1 parent 3372632 commit 0d392a9
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 14 deletions.
12 changes: 7 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
19 changes: 10 additions & 9 deletions packaging/hipify-clang.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down

0 comments on commit 0d392a9

Please sign in to comment.