From 939e62c0f5f2a56ab4b03e18064b44605a2b95a5 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Thu, 1 Jun 2023 17:54:13 -0400 Subject: [PATCH] Move FindHIP to datadir For Fedora, hip-devel is a good place for FindHIP, but it's a noarch package so move it to datadir. We might want to propose this later if upstream separates HIP from hipamd. Change-Id: If368620a6c66ca93624d023153f756d8f5c992d2 --- hipamd/CMakeLists.txt | 2 +- hipamd/packaging/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt index 6b5d8d3c5..fefab6acc 100755 --- a/hipamd/CMakeLists.txt +++ b/hipamd/CMakeLists.txt @@ -371,7 +371,7 @@ if(NOT ${INSTALL_SOURCE} EQUAL 0) if(WIN32) install(DIRECTORY ${HIP_COMMON_DIR}/cmake DESTINATION .) else() - install(DIRECTORY ${HIP_COMMON_DIR}/cmake/ DESTINATION ${CONFIG_PACKAGE_INSTALL_DIR}) + install(DIRECTORY ${HIP_COMMON_DIR}/cmake/ DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/hip) endif() endif() diff --git a/hipamd/packaging/CMakeLists.txt b/hipamd/packaging/CMakeLists.txt index 3eac9cf14..ab8a92e10 100644 --- a/hipamd/packaging/CMakeLists.txt +++ b/hipamd/packaging/CMakeLists.txt @@ -62,7 +62,7 @@ if(HIP_PLATFORM STREQUAL "amd" ) #Keeping it as is for now install(FILES ${CMAKE_BINARY_DIR}/hipamd/.hipInfo DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT binary) -install(FILES ${CMAKE_BINARY_DIR}/hipamd/hip-config.cmake ${CMAKE_BINARY_DIR}/hipamd/hip-config-version.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/hip COMPONENT binary) +install(FILES ${CMAKE_BINARY_DIR}/hipamd/hip-config.cmake ${CMAKE_BINARY_DIR}/hipamd/hip-config-version.cmake DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/hip COMPONENT binary) install ( EXPORT hip-targets FILE hip-targets.cmake NAMESPACE hip:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/hip COMPONENT binary) install(FILES ${CMAKE_BINARY_DIR}/hipamd/src/hip-lang-config.cmake ${CMAKE_BINARY_DIR}/hipamd/src/hip-lang-config-version.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/hip-lang COMPONENT binary) -- 2.40.1