Merge https://github.com/Microsoft/vcpkg

2 files changed, 32 insertions, 19 deletions

diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake
index 41415d9a8..983ac9221 100644
--- a/scripts/cmake/vcpkg_build_cmake.cmake
+++ b/scripts/cmake/vcpkg_build_cmake.cmake
@@ -131,25 +131,31 @@ function(vcpkg_build_cmake)
                         OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE)
 
                     if (UNAME_R MATCHES "Microsoft")
-                        message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} because of (potential) wsl subsystem issue.")
-                        execute_process(
-                            COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS}
-                            OUTPUT_FILE "${LOGPREFIX}-out-1.log"
-                            ERROR_FILE "${LOGPREFIX}-err-1.log"
-                            RESULT_VARIABLE error_code
-                            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE})
-
-                        if(error_code)
-                            file(READ "${LOGPREFIX}-out-1.log" out_contents)
-                            file(READ "${LOGPREFIX}-err-1.log" err_contents)
-
-                            if(out_contents)
-                                list(APPEND LOGS "${LOGPREFIX}-out-1.log")
+                        set(ITERATION 0)
+                        while (ITERATION LESS 10 AND out_contents MATCHES ": No such file or directory")
+                            MATH(EXPR ITERATION "${ITERATION}+1")
+                            message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} because of wsl subsystem issue. Iteration: ${ITERATION}")
+                            execute_process(
+                                COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS}
+                                OUTPUT_FILE "${LOGPREFIX}-out-${ITERATION}.log"
+                                ERROR_FILE "${LOGPREFIX}-err-${ITERATION}.log"
+                                RESULT_VARIABLE error_code
+                                WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE})
+
+                            if(error_code)
+                                file(READ "${LOGPREFIX}-out-${ITERATION}.log" out_contents)
+                                file(READ "${LOGPREFIX}-err-${ITERATION}.log" err_contents)
+
+                                if(out_contents)
+                                    list(APPEND LOGS "${LOGPREFIX}-out-${ITERATION}.log")
+                                endif()
+                                if(err_contents)
+                                    list(APPEND LOGS "${LOGPREFIX}-err-${ITERATION}.log")
+                                endif()
+                            else()
+                                break()
                             endif()
-                            if(err_contents)
-                                list(APPEND LOGS "${LOGPREFIX}-err-1.log")
-                            endif()
-                        endif()
+                        endwhile()
                     endif()
                 endif()
 
diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
index 475047737..47c91f83c 100644
--- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
+++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
@@ -28,6 +28,12 @@ function(vcpkg_fixup_cmake_targets)
     set(RELEASE_SHARE ${CURRENT_PACKAGES_DIR}/${_vfct_TARGET_PATH})
 
     if(_vfct_CONFIG_PATH AND NOT RELEASE_SHARE STREQUAL "${CURRENT_PACKAGES_DIR}/${_vfct_CONFIG_PATH}")
+        if(_vfct_CONFIG_PATH STREQUAL "share")
+            file(RENAME ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/debug/share2)
+            file(RENAME ${CURRENT_PACKAGES_DIR}/share ${CURRENT_PACKAGES_DIR}/share2)
+            set(_vfct_CONFIG_PATH share2)
+        endif()
+
         set(DEBUG_CONFIG ${CURRENT_PACKAGES_DIR}/debug/${_vfct_CONFIG_PATH})
         set(RELEASE_CONFIG ${CURRENT_PACKAGES_DIR}/${_vfct_CONFIG_PATH})
 
@@ -36,6 +42,7 @@ function(vcpkg_fixup_cmake_targets)
                 message(FATAL_ERROR "'${DEBUG_CONFIG}' does not exist.")
             endif()
 
+            # This roundabout handling enables CONFIG_PATH share
             file(MAKE_DIRECTORY ${DEBUG_SHARE})
             file(GLOB FILES ${DEBUG_CONFIG}/*)
             file(COPY ${FILES} DESTINATION ${DEBUG_SHARE})
@@ -76,7 +83,7 @@ function(vcpkg_fixup_cmake_targets)
     endif()
 
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        if(NOT EXISTS ${DEBUG_SHARE})
+        if(NOT EXISTS "${DEBUG_SHARE}")
             message(FATAL_ERROR "'${DEBUG_SHARE}' does not exist.")
         endif()
     endif()