From f02227e678a7c6e596f5c8b1831ad8ce6ebef83a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 4 Dec 2021 15:47:21 +0100 Subject: [PATCH 1/6] Fix uwp toolchain chainloading --- ports/vcpkg-cmake/vcpkg.json | 2 +- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 49b1387178e8c5..22da48602a989c 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,4 +1,4 @@ { "name": "vcpkg-cmake", - "version-date": "2021-09-13" + "version-date": "2021-12-05" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index c9657bfa9a0941..9822e82089ece7 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -278,7 +278,7 @@ function(vcpkg_cmake_configure) endif() if(NOT DEFINED VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - if(NOT DEFINED VCPKG_CMAKE_SYSTEM_NAME OR _TARGETTING_UWP) + if(NOT DEFINED VCPKG_CMAKE_SYSTEM_NAME OR targetting_uwp) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") From c14951209ee4347b74f545e9b19e19731ce701c0 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 4 Dec 2021 15:56:05 +0100 Subject: [PATCH 2/6] Use common definitions --- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index 9822e82089ece7..4c675a07d3336a 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -150,15 +150,11 @@ function(vcpkg_cmake_configure) set(ninja_can_be_used ON) # Ninja as generator set(ninja_host ON) # Ninja as parallel configurator - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(targetting_uwp ON) - endif() - if(host_architecture STREQUAL "x86") # Prebuilt ninja binaries are only provided for x64 hosts set(ninja_can_be_used OFF) set(ninja_host OFF) - elseif(targetting_uwp) + elseif(VCPKG_TARGET_IS_UWP) # Ninja and MSBuild have many differences when targetting UWP, so use MSBuild to maximize existing compatibility set(ninja_can_be_used OFF) endif() @@ -247,9 +243,9 @@ function(vcpkg_cmake_configure) if(DEFINED VCPKG_CMAKE_SYSTEM_NAME) list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") - if(targetting_uwp AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + if(VCPKG_TARGET_IS_UWP AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android" AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + elseif(VCPKG_TARGET_IS_ANDROID AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) set(VCPKG_CMAKE_SYSTEM_VERSION 21) endif() endif() @@ -278,22 +274,22 @@ function(vcpkg_cmake_configure) endif() if(NOT DEFINED VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - if(NOT DEFINED VCPKG_CMAKE_SYSTEM_NAME OR targetting_uwp) + if(VCPKG_TARGET_IS_MINGW) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") + elseif(VCPKG_TARGET_IS_WINDOWS) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + elseif(VCPKG_TARGET_IS_LINUX) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") + elseif(VCPKG_TARGET_IS_ANDROID) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + elseif(VCPKG_TARGET_IS_OSX) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS") + elseif(VCPKG_TARGET_IS_IOS) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + elseif(VCPKG_TARGET_IS_FREEBSD) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") + elseif(VCPKG_TARGET_IS_OPENBSD) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/openbsd.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") endif() endif() From 36ad59f42044d70c39e120afd330b38e32ee1f63 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 4 Dec 2021 15:57:16 +0100 Subject: [PATCH 3/6] Update versions --- versions/baseline.json | 2 +- versions/v-/vcpkg-cmake.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 50becf31bbfc07..09964676e5b539 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7065,7 +7065,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2021-09-13", + "baseline": "2021-12-05", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 6c05751fd73036..1860c961d15704 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "462dd9ada82163b8c104cef8c2ad5b5c0bfa5eb8", + "version-date": "2021-12-05", + "port-version": 0 + }, { "git-tree": "fc4d9fcc5b8d2b97c083c6b70dd06df5174bd97b", "version-date": "2021-09-13", From e280ffcdcdfb706ad477fd7c9283a0301e225832 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 5 Dec 2021 00:22:26 +0100 Subject: [PATCH 4/6] [netcdf-c] Fix uwp compiler flags --- ports/netcdf-c/portfile.cmake | 4 ++-- ports/netcdf-c/vcpkg.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index 36282b471c3d98..62f580e6f28388 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -55,8 +55,8 @@ if(ENABLE_HDF5) endif() if(VCPKG_TARGET_IS_UWP) - set(ENV{CFLAGS} "$ENV{CFLAGS} /wd4996 /wd4703") - set(ENV{CXXFLAGS} "$ENV{CXXFLAGS} /wd4996 /wd4703") + string(APPEND VCPKG_C_FLAGS " /wd4996 /wd4703") + string(APPEND VCPKG_CXX_FLAGS " /wd4996 /wd4703") endif() vcpkg_cmake_configure( diff --git a/ports/netcdf-c/vcpkg.json b/ports/netcdf-c/vcpkg.json index e1ba70f343dfcc..80fbcdd10e71d1 100644 --- a/ports/netcdf-c/vcpkg.json +++ b/ports/netcdf-c/vcpkg.json @@ -1,6 +1,7 @@ { "name": "netcdf-c", "version": "4.8.1", + "port-version": 1, "description": "A set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.", "homepage": "https://github.com/Unidata/netcdf-c", "dependencies": [ From dfe6b57bcb1e76e2b3672ab5333c5ecea8f31a8e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 5 Dec 2021 00:23:06 +0100 Subject: [PATCH 5/6] Update versions --- versions/baseline.json | 2 +- versions/n-/netcdf-c.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 09964676e5b539..8541abf7053e83 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4670,7 +4670,7 @@ }, "netcdf-c": { "baseline": "4.8.1", - "port-version": 0 + "port-version": 1 }, "netcdf-cxx4": { "baseline": "4.3.1", diff --git a/versions/n-/netcdf-c.json b/versions/n-/netcdf-c.json index 8aed42aefaf61f..61db416a003d98 100644 --- a/versions/n-/netcdf-c.json +++ b/versions/n-/netcdf-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d8a0a97fd75563172e3f1947608db3802c3b84a", + "version": "4.8.1", + "port-version": 1 + }, { "git-tree": "7e6529a5673ac8494b62443a9fab590ce6810826", "version": "4.8.1", From a9d2bd2e45dc6920ab9d7d9527b5bd2b1c380be5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 8 Dec 2021 06:08:20 +0100 Subject: [PATCH 6/6] [skip actions] CI