From 3e2555cf2e21323e8f96aea11e82edb869b267c5 Mon Sep 17 00:00:00 2001 From: darren-amd Date: Thu, 27 Mar 2025 11:26:12 -0400 Subject: [PATCH 1/2] Include hip::host, device, and amdhip64 in nvidia cmake --- ...onfig-nvidia.cmake => hip-config-nvidia.cmake.in} | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) rename hipamd/{hip-config-nvidia.cmake => hip-config-nvidia.cmake.in} (74%) diff --git a/hipamd/hip-config-nvidia.cmake b/hipamd/hip-config-nvidia.cmake.in similarity index 74% rename from hipamd/hip-config-nvidia.cmake rename to hipamd/hip-config-nvidia.cmake.in index fcc7620152..faa266e46c 100755 --- a/hipamd/hip-config-nvidia.cmake +++ b/hipamd/hip-config-nvidia.cmake.in @@ -18,6 +18,12 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -add_library(hip::device INTERFACE IMPORTED) -add_library(hip::host INTERFACE IMPORTED) -add_library(hip::amdhip64 INTERFACE IMPORTED) +foreach(__lib device host amdhip64) + if (NOT TARGET hip::${__lib}) + add_library(hip::${__lib} INTERFACE IMPORTED) + set_target_properties(hip::${__lib} PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "__HIP_PLATFORM_NVIDIA__=1" + INTERFACE_INCLUDE_DIRECTORIES @PACKAGE_INCLUDE_INSTALL_DIR@ + INTERFACE_SYSTEM_INCLUDE_DIRECTORIES @PACKAGE_INCLUDE_INSTALL_DIR@) + endif() +endforeach() From d7e67585352d94da8789eb89d42b1b09e7bc7517 Mon Sep 17 00:00:00 2001 From: darren-amd Date: Thu, 27 Mar 2025 11:27:20 -0400 Subject: [PATCH 2/2] Rename hip-config-nvidia --- hipamd/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt index b9f90e315e..2ba67c1eca 100755 --- a/hipamd/CMakeLists.txt +++ b/hipamd/CMakeLists.txt @@ -446,7 +446,7 @@ configure_package_config_file( ) configure_package_config_file( - hip-config-nvidia.cmake + hip-config-nvidia.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/hip-config-nvidia.cmake INSTALL_DESTINATION ${CONFIG_PACKAGE_INSTALL_DIR} PATH_VARS LIB_INSTALL_DIR INCLUDE_INSTALL_DIR BIN_INSTALL_DIR