From d341a6263a7fa62164e3d9c9ca46c5519ade4f6a Mon Sep 17 00:00:00 2001 From: "systems-assistant[bot]" <221163467+systems-assistant[bot]@users.noreply.github.com> Date: Tue, 9 Sep 2025 13:51:15 +0100 Subject: [PATCH] Put safeguard to avoid defining target more than once authored-by: Mathieu Taillefumier --- projects/clr/hipamd/CMakeLists.txt | 2 +- ...config-nvidia.cmake => hip-config-nvidia.cmake.in} | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) rename projects/clr/hipamd/{hip-config-nvidia.cmake => hip-config-nvidia.cmake.in} (77%) diff --git a/projects/clr/hipamd/CMakeLists.txt b/projects/clr/hipamd/CMakeLists.txt index 7da51f1f2b..8529edf19c 100755 --- a/projects/clr/hipamd/CMakeLists.txt +++ b/projects/clr/hipamd/CMakeLists.txt @@ -444,7 +444,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 diff --git a/projects/clr/hipamd/hip-config-nvidia.cmake b/projects/clr/hipamd/hip-config-nvidia.cmake.in similarity index 77% rename from projects/clr/hipamd/hip-config-nvidia.cmake rename to projects/clr/hipamd/hip-config-nvidia.cmake.in index fcc7620152..cfc5ecd5e0 100755 --- a/projects/clr/hipamd/hip-config-nvidia.cmake +++ b/projects/clr/hipamd/hip-config-nvidia.cmake.in @@ -18,6 +18,11 @@ # 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_INCLUDE_DIRECTORIES @PACKAGE_INCLUDE_INSTALL_DIR@ + INTERFACE_SYSTEM_INCLUDE_DIRECTORIES @PACKAGE_INCLUDE_INSTALL_DIR@) + endif() +endforeach()