From 7b18eda1219cff78ada685c49a1c1f5f784376dc Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 9 Aug 2019 17:23:09 -0400 Subject: [PATCH] Install to standard locations using GNUInstallDirs Change-Id: I6bafae15d2a0dfb70389673e03b6f72737786501 [ROCm/rocminfo commit: f1181e05690a82dd0003b0b7264736b0e42ffcb8] --- projects/rocminfo/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/rocminfo/CMakeLists.txt b/projects/rocminfo/CMakeLists.txt index a733d8a2e4..ce08409c3f 100755 --- a/projects/rocminfo/CMakeLists.txt +++ b/projects/rocminfo/CMakeLists.txt @@ -2,6 +2,7 @@ # Minimum version of cmake required # cmake_minimum_required(VERSION 2.8.0) +include ( GNUInstallDirs ) # # GCC 4.8 or higher compiler required. # @@ -227,11 +228,11 @@ target_link_libraries(${ROCMINFO_EXE} ${ROCR_LIBS} c stdc++ dl pthread rt) install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${ROCMINFO_EXE} PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - DESTINATION bin ) + DESTINATION ${CMAKE_INSTALL_BINDIR} ) install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/rocm_agent_enumerator PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - DESTINATION bin ) + DESTINATION ${CMAKE_INSTALL_BINDIR} ) ########################### # Packaging directives @@ -261,7 +262,7 @@ set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_DEBIAN_PACKAGE_HOMEPAGE} CACHE STRING # RPM package specific variables ########################### if ( DEFINED CPACK_PACKAGING_INSTALL_PREFIX ) - set ( CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/bin" ) + set ( CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" ) endif ( ) ###########################