Set install path of libSwiftScan to 'lib/swift/host' instead of platform-specific path string

Author: artemcm

tools/libSwiftScan/CMakeLists.txt

@@ -46,9 +46,53 @@ add_link_opts(libSwiftScan)
 
 add_dependencies(compiler libSwiftScan)
 swift_install_in_component(TARGETS libSwiftScan
-  ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}" COMPONENT compiler
-  LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}" COMPONENT compiler
+  ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host" COMPONENT compiler
+  LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host" COMPONENT compiler
   RUNTIME DESTINATION "bin" COMPONENT compiler)
+
+# Create a symlink to previously-used path of 'lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}'
+# to the new location under 'lib/swift/host' for clients of the legacy path.
+if(EXISTS ${LLVM_CMAKE_DIR}/LLVMInstallSymlink.cmake)
+  set(INSTALL_SYMLINK ${LLVM_CMAKE_DIR}/LLVMInstallSymlink.cmake)
+endif()
+precondition(INSTALL_SYMLINK
+             MESSAGE "LLVMInstallSymlink script must be available.")
+
+
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
+  # Shared Runtime
+  file(RELATIVE_PATH target_install_relative_path
+      ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}
+      ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/swift/host/${SWIFT_SCAN_LIB_NAME}.dll)
+  message(STATUS "Installing symlink (${target_install_relative_path}) to lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}/${SWIFT_SCAN_LIB_NAME}.dll")
+  install(SCRIPT ${INSTALL_SYMLINK}
+          CODE "install_symlink(${SWIFT_SCAN_LIB_NAME}.dll
+                                ${target_install_relative_path}
+                                ${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR})"
+          COMPONENT compiler)
+
+  # Import Library
+  file(RELATIVE_PATH target_install_relative_path
+      ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}
+      ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/swift/host/${SWIFT_SCAN_LIB_NAME}.lib)
+  message(STATUS "Installing symlink (${target_install_relative_path}) to lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}/${SWIFT_SCAN_LIB_NAME}.lib")
+  install(SCRIPT ${INSTALL_SYMLINK}
+          CODE "install_symlink(${SWIFT_SCAN_LIB_NAME}.lib
+                                ${target_install_relative_path}
+                                ${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR})"
+          COMPONENT compiler)
+else()
+  file(RELATIVE_PATH target_install_relative_path
+      ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}
+      ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/swift/host/lib${SWIFT_SCAN_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+  message(STATUS "Installing symlink (${target_install_relative_path}) to lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}/lib${SWIFT_SCAN_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+  install(SCRIPT ${INSTALL_SYMLINK}
+          CODE "install_symlink(lib${SWIFT_SCAN_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+                                ${target_install_relative_path}
+                                lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR})"
+          COMPONENT compiler)
+endif()
+
 swift_install_in_component(DIRECTORY "${SWIFT_MAIN_INCLUDE_DIR}/swift-c/DependencyScan/"
                            DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SCAN_LIB_NAME}"
                            COMPONENT compiler)