From 8bec8b516bae9984aca8a54d9d858bf32bf0c09e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 10 Jan 2020 06:39:10 +0800 Subject: [sdl1]Change build method to vcpkg_*_make (#9207) * [sdl1]Change build method to vcpkg_*_make * [sdl1] Fix output message * [sdl1]Fix build. * [sdl1] Correct message * update baseline --- scripts/ci.baseline.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c45d4bbb7..6dec59170 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1490,8 +1490,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 -- cgit v1.2.3 From 504eeea5148510645a884688d04434373054d501 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 10 Jan 2020 00:26:27 +0100 Subject: Map MinSizeRel and RelWithDebInfo correctly (#6393) * Map MinSizeRel and RelWithDebInfo to Release by default * switch to CMAKE_CONFIGURATION_TYPES * changed mapping slightly * add empty list element to the mapping * more comments and an option to turn verbose messages on. * removed line info. It would require the file name to make sense out of it. --- scripts/buildsystems/vcpkg.cmake | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'scripts') 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) -- cgit v1.2.3 From 7dc8ecbc08eed912fe1952c3d462cfc683931060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sat, 11 Jan 2020 02:47:09 +0800 Subject: [azure-kinect-sensor-sdk] Remove feature test and fix static build in Windows (#9458) * [azure-kinect-sensor] Remove feature test and fix static build in Windows * [azure-kinect-sensor-sdk] Re-fix components install path using patch * [azure-kinect-sensor-sdk] Remove bin debug/bin in static build * update baseline --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 6dec59170..242f7eb02 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 -- cgit v1.2.3 From 3200392582ecef9e957ee934262adb4fecf7a2d5 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Sat, 11 Jan 2020 07:43:06 +0800 Subject: [libplist] Update to 1.2.137 (#8936) * [libplist] Upgrade to 1.2.137 * Update CMakeLists.txt * [libplist] Update build status Co-authored-by: Robert Schumacher --- scripts/ci.baseline.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 242f7eb02..0118f405d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -828,9 +828,6 @@ libpff:x64-linux=fail libpff:x64-osx=fail libpff:x64-uwp=fail libpff:x64-windows-static=fail -libplist:arm64-windows=fail -libplist:arm-uwp=fail -libplist:x64-linux=fail libplist:x64-osx=fail libplist:x64-windows-static=fail libpng-apng:arm64-windows = skip @@ -894,7 +891,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 -- cgit v1.2.3 From 0fb8168c7c5f83784a62c8051bd6429a9e8c454e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sat, 11 Jan 2020 07:46:23 +0800 Subject: [caf] Update to 0.17.2 (#8888) * [caf]Upgrade to 0.17.2 * update baseline --- scripts/ci.baseline.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0118f405d..b53aafb16 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -180,6 +180,7 @@ bullet3:arm-uwp=fail bullet3:x64-uwp=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 -- cgit v1.2.3 From 1990d4b72c58c2ada5f0b7b28478d214fb3205da Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 10 Jan 2020 15:48:44 -0800 Subject: [libwandio] Add new port (#8683) * [libwandio] Add new port * Update ci.baseline.txt --- scripts/ci.baseline.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index b53aafb16..0dee242a4 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -918,6 +918,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 -- cgit v1.2.3 From fc34b74ce2a902fc235ac4c60d68eacaf9488948 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 10 Jan 2020 15:50:35 -0800 Subject: [libevhtp] Add new port (#8678) * [libevhtp] Add new port * Add homepage * Update ci.baseline.txt --- scripts/ci.baseline.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0dee242a4..e7a209601 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -713,6 +713,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 -- cgit v1.2.3