Merge 'master' into 'amd-master'

Change-Id: I18d9b45dfd9df8398fd2a8e0e2590f3c722aeeca
ROCm · Apr 7, 2022 · 3aef806 · 3aef806
2 parents 4f41f0c + bd4e360
commit 3aef806
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 14 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -32,11 +32,14 @@ jobs:
       matrix:
         platform:
           - ubuntu-18.04
-          - macos-10.14
-          - windows-2016
+          - macos-10.15
+          - windows-2019
         cmake-version:
           - 3.20.0
           - 3.10.2
+        exclude:
+          - platform: windows-2019
+            cmake-version: 3.10.2
 
     steps:
     - uses: actions/checkout@v1

diff --git a/share/rocm/cmake/ROCMCreatePackage.cmake b/share/rocm/cmake/ROCMCreatePackage.cmake
@@ -181,7 +181,6 @@ macro(rocm_set_cpack_gen)
             string(TOUPPER $ENV{ROCM_PKGTYPE} CPACK_GENERATOR) # PKGTYPE is typically lower case
         else()
             # Otherwise see what we can find
-            message(INFO "rocm_set_cpack_gen didn't find ROCM_PKGTYPE in environment")
             set(CPACK_GENERATOR "TGZ;ZIP")
             if(EXISTS ${MAKE_NSIS_EXE})
                 list(APPEND CPACK_GENERATOR "NSIS")

diff --git a/share/rocm/cmake/ROCMInstallTargets.cmake b/share/rocm/cmake/ROCMInstallTargets.cmake
@@ -159,18 +159,26 @@ function(rocm_install_targets)
                         NAMELINK_ONLY
             )
         endif()
-        if(T_TYPE MATCHES ".*_LIBRARY" AND ROCM_SYMLINK_LIBS AND NOT ROCM_CREATED_${PROJECT_NAME}_SYMLINK
-            AND NOT CMAKE_HOST_WIN32)
-
-            set(ROCM_CREATED_${PROJECT_NAME}_SYMLINK TRUE CACHE INTERNAL "Record symlink created.")
+        if(ROCM_SYMLINK_LIBS AND NOT WIN32 AND T_TYPE MATCHES ".*_LIBRARY"
+            AND NOT T_TYPE STREQUAL "INTERFACE_LIBRARY")
             string(TOLOWER "${PROJECT_NAME}" LINK_SUBDIR)
-
-            set(INSTALL_CMD "
-                set(LINK_DIR \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${LINK_SUBDIR})
-                file(MAKE_DIRECTORY \${LINK_DIR})
-                execute_process(COMMAND ln -sf ../lib \${LINK_DIR}/${ROCM_INSTALL_LIBDIR})
+            file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_symlink.cmake
+                CONTENT "
+                set(SRC_DIR \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX})
+                set(LINK_DIR \${SRC_DIR}/${LINK_SUBDIR})
+                if(NOT EXISTS \${LINK_DIR}/${ROCM_INSTALL_LIBDIR})
+                    file(MAKE_DIRECTORY \${LINK_DIR}/${ROCM_INSTALL_LIBDIR})
+                endif()
+                file(RELATIVE_PATH LINK_PATH
+                    \${LINK_DIR}/${ROCM_INSTALL_LIBDIR}
+                    \${SRC_DIR}/${ROCM_INSTALL_LIBDIR})
+                execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink
+                    \${LINK_PATH}/$<TARGET_LINKER_FILE_NAME:${TARGET}>
+                    \${LINK_DIR}/${ROCM_INSTALL_LIBDIR}/$<TARGET_LINKER_FILE_NAME:${TARGET}>
+                )
             ")
-            rocm_install(CODE "${INSTALL_CMD}")
+
+            rocm_install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_symlink.cmake")
         endif()
     endforeach()
 endfunction()
@@ -319,4 +327,24 @@ function(rocm_export_targets)
         DESTINATION
             ${CONFIG_PACKAGE_INSTALL_DIR})
 
+    if(ROCM_SYMLINK_LIBS AND NOT WIN32)
+        string(TOLOWER "${PROJECT_NAME}" LINK_SUBDIR)
+        file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/cmake_symlink.cmake"
+            CONTENT "
+            set(SRC_DIR \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX})
+            set(LINK_DIR \${SRC_DIR}/${LINK_SUBDIR})
+            if(NOT EXISTS \${LINK_DIR}/${ROCM_INSTALL_LIBDIR}/cmake)
+                file(MAKE_DIRECTORY \${LINK_DIR}/${ROCM_INSTALL_LIBDIR}/cmake)
+            endif()
+            file(RELATIVE_PATH LINK_PATH
+                \${LINK_DIR}/${ROCM_INSTALL_LIBDIR}/cmake
+                \${SRC_DIR}/${CONFIG_PACKAGE_INSTALL_DIR}
+            )
+            execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink
+                \${LINK_PATH}
+                \${LINK_DIR}/${CONFIG_PACKAGE_INSTALL_DIR}
+            )
+            ")
+        rocm_install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/cmake_symlink.cmake")
+    endif()
 endfunction()
diff --git a/test/test.cmake b/test/test.cmake
@@ -109,7 +109,7 @@ function(install_dir DIR)
     configure_dir(
         ${DIR}
         TARGETS all ${PARSE_TARGETS} install
-        CMAKE_ARGS ${PARSE_CMAKE_ARGS})
+        CMAKE_ARGS ${PARSE_CMAKE_ARGS} -DROCM_SYMLINK_LIBS=OFF)
 endfunction()
 
 function(write_version_cmake DIR VERSION CONTENT)