Merge branch 'master' into dev/jack/update_osx_baseline

2 files changed, 38 insertions, 3 deletions

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 87a206eb1..e549f3fa1 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -1,6 +1,10 @@
 # Mark variables as used so cmake doesn't complain about them
 mark_as_advanced(CMAKE_TOOLCHAIN_FILE)
 
+# VCPKG toolchain options. 
+option(VCPKG_VERBOSE "Enables messages from the VCPKG toolchain for debugging purposes." OFF)
+mark_as_advanced(VCPKG_VERBOSE)
+
 # Determine whether the toolchain is loaded during a try-compile configuration
 get_property(_CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE)
 
@@ -22,6 +26,24 @@ if(VCPKG_TOOLCHAIN)
     return()
 endif()
 
+if(DEFINED CMAKE_CONFIGURATION_TYPES) #Generating with a multi config generator
+    #If CMake does not have a mapping for MinSizeRel and RelWithDebInfo in imported targets
+    #it will map those configuration to the first valid configuration in CMAKE_CONFIGURATION_TYPES.
+    #By default this is the debug configuration which is wrong. 
+    if(NOT DEFINED CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL)
+        set(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL "MinSizeRel;Release;")
+        if(VCPKG_VERBOSE)
+            message(STATUS "VCPKG-Info: CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL set to MinSizeRel;Release;")
+        endif()
+    endif()
+    if(NOT DEFINED CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO)
+        set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO "RelWithDebInfo;Release;")
+        if(VCPKG_VERBOSE)
+            message(STATUS "VCPKG-Info: CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO set to RelWithDebInfo;Release;")
+        endif()
+    endif()
+endif()
+
 if(VCPKG_TARGET_TRIPLET)
 elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Ww][Ii][Nn]32$")
     set(_VCPKG_TARGET_TRIPLET_ARCH x86)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index bcfbeb9ab..55b7f347f 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -113,7 +113,6 @@ aws-lambda-cpp:x86-windows=fail
 aws-sdk-cpp:x64-linux=ignore

 azure-c-shared-utility:arm-uwp=fail

 azure-c-shared-utility:x64-uwp=fail

-azure-kinect-sensor-sdk:x64-windows-static=fail

 basisu:x64-linux=ignore

 bde:arm64-windows=fail

 bde:arm-uwp=fail

@@ -182,6 +181,7 @@ bullet3:x64-uwp=fail
 bullet3:x64-osx=fail

 butteraugli:x64-linux=ignore

 caf:arm-uwp=fail

+caf:arm64-windows=fail

 caf:x64-uwp=fail

 caf:x64-linux=ignore

 caffe2:x86-windows=fail

@@ -714,6 +714,12 @@ libepoxy:x64-uwp=fail
 libepoxy:x64-windows-static=fail

 libevent:arm-uwp=fail

 libevent:x64-uwp=fail

+libevhtp:x86-windows=fail

+libevhtp:x64-windows=fail

+libevhtp:x64-windows-static=fail

+libevhtp:x64-uwp=fail

+libevhtp:arm64-windows=fail

+libevhtp:arm-uwp=fail

 libexif:arm-uwp=fail

 libexif:x64-uwp=fail

 libfabric:arm-uwp=fail

@@ -896,7 +902,10 @@ libusb:arm-uwp=fail
 libusb:x64-linux=fail

 libusb:x64-osx=fail

 libusb:x64-uwp=fail

+libusbmuxd:arm64-windows=fail

+libusbmuxd:arm-uwp=fail

 libusbmuxd:x64-uwp=fail

+libusbmuxd:x64-linux=fail

 libusb-win32:arm64-windows=fail

 libusb-win32:arm-uwp=fail

 libusb-win32:x64-linux=fail

@@ -919,6 +928,12 @@ libvpx:arm64-windows=fail
 libvpx:arm-uwp=fail

 libvpx:x64-linux=fail

 libvpx:x64-osx=fail

+libwandio:x86-windows=fail

+libwandio:x64-windows=fail

+libwandio:x64-windows-static=fail

+libwandio:x64-uwp=fail

+libwandio:arm64-windows=fail

+libwandio:arm-uwp=fail

 libwebsockets:arm-uwp=fail

 libwebsockets:x64-uwp=fail

 libxmp-lite:x64-linux=fail

@@ -1491,8 +1506,6 @@ sdformat6:arm-uwp=fail
 sdformat6:x64-uwp=fail

 sdformat6:x64-linux=ignore

 sdl1:arm-uwp=fail

-sdl1:x64-linux=fail

-sdl1:x64-osx=fail

 sdl1:x64-uwp=fail

 sdl2-gfx:arm64-windows=fail

 sdl2-gfx:x64-linux=fail