瀏覽代碼

BundleUtilities: Ensure target dir exists when creating symlinks

Commit v3.13.0-rc1~279^2 (GetPrerequisites: Move dylibs from MacOS
to Frameworks folder in bundle, 2018-07-22) introduced a regression
that can cause symlink creation to fail during packaging. Symlinks
can be created before targets are installed, so the destination
directory of the symlink sometimes won't exist at symlink creation.

Fixes: #18726
Tim Blechmann 7 年之前
父節點
當前提交
200bf57742
共有 1 個文件被更改,包括 3 次插入0 次删除
  1. 3 0
      Modules/BundleUtilities.cmake

+ 3 - 0
Modules/BundleUtilities.cmake

@@ -720,6 +720,9 @@ function(link_resolved_item_into_bundle resolved_item resolved_embedded_item)
   else()
   else()
     get_filename_component(target_dir "${resolved_embedded_item}" DIRECTORY)
     get_filename_component(target_dir "${resolved_embedded_item}" DIRECTORY)
     file(RELATIVE_PATH symlink_target "${target_dir}" "${resolved_item}")
     file(RELATIVE_PATH symlink_target "${target_dir}" "${resolved_item}")
+    if (NOT EXISTS "${target_dir}")
+      file(MAKE_DIRECTORY "${target_dir}")
+    endif()
     execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${symlink_target}" "${resolved_embedded_item}")
     execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${symlink_target}" "${resolved_embedded_item}")
   endif()
   endif()
 endfunction()
 endfunction()