From aafdf57db13729f91d739dd4319d994f5a5b2bca Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 29 Mar 2022 13:00:43 +0200 Subject: [PATCH 01/14] put default generator and toolchain selection into a function --- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 83 +---------- scripts/cmake/vcpkg_configure_cmake.cmake | 136 ++++++++++++------ scripts/cmake/vcpkg_configure_meson.cmake | 18 +-- 3 files changed, 98 insertions(+), 139 deletions(-) diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index 95ee7e23ea1d80..1a91584c8e6471 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -159,71 +159,18 @@ function(vcpkg_cmake_configure) set(ninja_can_be_used OFF) endif() - set(generator) + set(generator "Ninja") if(DEFINED arg_GENERATOR) set(generator "${arg_GENERATOR}") elseif(arg_WINDOWS_USE_MSBUILD OR NOT ninja_can_be_used) - if(VCPKG_PLATFORM_TOOLSET STREQUAL "v120") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(generator "Visual Studio 12 2013") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(generator "Visual Studio 12 2013 Win64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(generator "Visual Studio 12 2013 ARM") - endif() - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v140") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(generator "Visual Studio 14 2015") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(generator "Visual Studio 14 2015 Win64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(generator "Visual Studio 14 2015 ARM") - endif() - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v141") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(generator "Visual Studio 15 2017") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(generator "Visual Studio 15 2017 Win64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(generator "Visual Studio 15 2017 ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(generator "Visual Studio 15 2017") - set(arch "ARM64") - endif() - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v142") - set(generator "Visual Studio 16 2019") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(arch "Win32") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(arch "x64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(arch "ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(arch "ARM64") - else() - set(generator) - endif() - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v143") - set(generator "Visual Studio 17 2022") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(arch "Win32") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(arch "x64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(arch "ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(arch "ARM64") - else() - set(generator) - endif() - endif() - else() - set(generator "Ninja") + set(generator "") + set(arch "") + z_vcpkg_get_visual_studio_generator(generator arch) endif() - if(NOT DEFINED generator) + if(NOT DEFINED generator OR generator STREQUAL "") if(NOT VCPKG_CMAKE_SYSTEM_NAME) - set(VCPKG_CMAKE_SYSTEM_NAME Windows) + set(VCPKG_CMAKE_SYSTEM_NAME "Windows") endif() message(FATAL_ERROR "Unable to determine appropriate generator for: " "${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}") @@ -280,23 +227,7 @@ function(vcpkg_cmake_configure) endif() if(NOT DEFINED VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - 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_TARGET_IS_LINUX) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") - elseif(VCPKG_TARGET_IS_ANDROID) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") - elseif(VCPKG_TARGET_IS_OSX) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") - elseif(VCPKG_TARGET_IS_IOS) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") - elseif(VCPKG_TARGET_IS_FREEBSD) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") - elseif(VCPKG_TARGET_IS_OPENBSD) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/openbsd.cmake") - endif() + z_vcpkg_select_default_vcpkg_chainload_toolchain() endif() diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 84a8d1e2786867..d04259ab0023e4 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -98,6 +98,91 @@ function(z_vcpkg_configure_cmake_build_cmakecache out_var whereat build_type) set("${out_var}" "${${out_var}}${line}\"\n\n" PARENT_SCOPE) endfunction() +function(z_vcpkg_get_visual_studio_generator generator_var arch_var) + set(arch "") + if(VCPKG_PLATFORM_TOOLSET STREQUAL "v120") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(generator "Visual Studio 12 2013") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(generator "Visual Studio 12 2013 Win64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(generator "Visual Studio 12 2013 ARM") + endif() + elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v140") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(generator "Visual Studio 14 2015") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(generator "Visual Studio 14 2015 Win64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(generator "Visual Studio 14 2015 ARM") + endif() + elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v141") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(generator "Visual Studio 15 2017") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(generator "Visual Studio 15 2017 Win64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(generator "Visual Studio 15 2017 ARM") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(generator "Visual Studio 15 2017") + set(arch "ARM64") + endif() + elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v142") + set(generator "Visual Studio 16 2019") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(arch "Win32") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(arch "x64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(arch "ARM") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(arch "ARM64") + else() + set(generator "") + endif() + elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v143") + set(generator "Visual Studio 17 2022") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(arch "Win32") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(arch "x64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(arch "ARM") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(arch "ARM64") + else() + set(generator "") + endif() + endif() + set(${generator_var} "${generator}" PARENT_SCOPE) + set(${arch_var} "${arch}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_select_default_vcpkg_chainload_toolchain) + # Try avoiding adding more defaults here. + # Set VCPKG_CHAINLOAD_TOOLCHAIN_FILE explicitly in the triplet. + if(DEFINED Z_VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${Z_VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") + elseif(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_TARGET_IS_LINUX) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") + elseif(VCPKG_TARGET_IS_ANDROID) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") + elseif(VCPKG_TARGET_IS_OSX) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") + elseif(VCPKG_TARGET_IS_IOS) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") + elseif(VCPKG_TARGET_IS_FREEBSD) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") + elseif(VCPKG_TARGET_IS_OPENBSD) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/openbsd.cmake") + endif() + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${VCPKG_CHAINLOAD_TOOLCHAIN_FILE} PARENT_SCOPE) +endfunction() + function(vcpkg_configure_cmake) cmake_parse_arguments(PARSE_ARGV 0 arg @@ -159,38 +244,13 @@ function(vcpkg_configure_cmake) endif() endif() - set(generator "") + set(generator "Ninja") # the default generator is always ninja! set(generator_arch "") if(DEFINED arg_GENERATOR) set(generator "${arg_GENERATOR}") - elseif(arg_PREFER_NINJA AND ninja_can_be_used) - set(generator "Ninja") - elseif(VCPKG_CHAINLOAD_TOOLCHAIN_FILE OR NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) - set(generator "Ninja") - - else() - if("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v120" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") - set(generator "Visual Studio 12 2013") - elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v140" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") - set(generator "Visual Studio 14 2015") - elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v141") - set(generator "Visual Studio 15 2017") - elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v142") - set(generator "Visual Studio 16 2019") - elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v143") - set(generator "Visual Studio 17 2022") - endif() - - if("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x86") - set(generator_arch "Win32") - elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x64") - set(generator_arch "x64") - elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm") - set(generator_arch "ARM") - elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") - set(generator_arch "ARM64") - endif() - + else(NOT ninja_can_be_used) + set(generator "") + z_vcpkg_get_visual_studio_generator(generator generator_arch) if("${generator}" STREQUAL "" OR "${generator_arch}" STREQUAL "") message(FATAL_ERROR "Unable to determine appropriate generator for triplet ${TARGET_TRIPLET}: @@ -244,23 +304,7 @@ function(vcpkg_configure_cmake) endif() if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - 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") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "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() + z_vcpkg_select_default_vcpkg_chainload_toolchain() endif() vcpkg_list(APPEND arg_OPTIONS diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index e68ff652654392..2dc8bd206790c8 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -204,23 +204,7 @@ function(z_vcpkg_meson_generate_native_file_config config_type) #https://mesonbu string(APPEND native_file "[cmake]\n") if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") - elseif(VCPKG_TARGET_IS_LINUX) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") - elseif(VCPKG_TARGET_IS_ANDROID) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") - elseif(VCPKG_TARGET_IS_OSX) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") - elseif(VCPKG_TARGET_IS_IOS) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") - elseif(VCPKG_TARGET_IS_FREEBSD) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") - elseif(VCPKG_TARGET_IS_OPENBSD) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/openbsd.cmake") - elseif(VCPKG_TARGET_IS_MINGW) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") - endif() + z_vcpkg_select_default_vcpkg_chainload_toolchain() endif() string(APPEND native_file "VCPKG_TARGET_TRIPLET = '${TARGET_TRIPLET}'\n") From 5bba18528ba3aac73a86cf01bff9bd79f82fc55d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 29 Mar 2022 13:01:26 +0200 Subject: [PATCH 02/14] update version-date of script --- ports/vcpkg-cmake/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 0061a046eab5c0..550025c90cf82d 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,4 +1,4 @@ { "name": "vcpkg-cmake", - "version-date": "2022-01-19" + "version-date": "2022-03-29" } From 0abc14a51513e03b7f893d369b1519063a38bdc3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 29 Mar 2022 13:01:44 +0200 Subject: [PATCH 03/14] version stuff --- 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 316e85cdcc6041..571e61c6bcda7b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7261,7 +7261,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-01-19", + "baseline": "2022-03-29", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index b61a6fe25f1beb..aa76216c6bfb4c 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6984b236fb4247bf8ff350c585f492ea0290e183", + "version-date": "2022-03-29", + "port-version": 0 + }, { "git-tree": "b7c050fe60f91dcedef6d87a3f87584151bf8aee", "version-date": "2022-01-19", From 4d6c67b7270422e28653fc2f9602daa3467ec59e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 29 Mar 2022 14:24:11 +0200 Subject: [PATCH 04/14] restore PREFER_NINJA behavior on windows use elseif instead of else --- scripts/cmake/vcpkg_configure_cmake.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index d04259ab0023e4..8d07bfe8835afc 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -227,6 +227,10 @@ function(vcpkg_configure_cmake) set(ninja_can_be_used ON) # Ninja as generator set(ninja_host ON) # Ninja as parallel configurator + if(NOT arg_PREFER_NINJA AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(ninja_can_be_used OFF) + endif() + if(VCPKG_HOST_IS_WINDOWS) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) set(host_arch "$ENV{PROCESSOR_ARCHITEW6432}") @@ -248,7 +252,7 @@ function(vcpkg_configure_cmake) set(generator_arch "") if(DEFINED arg_GENERATOR) set(generator "${arg_GENERATOR}") - else(NOT ninja_can_be_used) + elseif(NOT ninja_can_be_used) set(generator "") z_vcpkg_get_visual_studio_generator(generator generator_arch) if("${generator}" STREQUAL "" OR "${generator_arch}" STREQUAL "") From ae8396a891b061e8c64b5e8f8aa14ecf2dd36ec3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 31 Mar 2022 00:13:34 +0200 Subject: [PATCH 05/14] cr ws change --- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index 1a91584c8e6471..ae85cb7c3096f8 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -168,7 +168,7 @@ function(vcpkg_cmake_configure) z_vcpkg_get_visual_studio_generator(generator arch) endif() - if(NOT DEFINED generator OR generator STREQUAL "") + if(NOT generator) if(NOT VCPKG_CMAKE_SYSTEM_NAME) set(VCPKG_CMAKE_SYSTEM_NAME "Windows") endif() From caceffa6a422657ae1f8bceae9a04a5281f142e5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 31 Mar 2022 00:14:11 +0200 Subject: [PATCH 06/14] missing , --- ports/vcpkg-cmake/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index a48c1fddfb9392..e797a34676ca61 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,5 @@ { "name": "vcpkg-cmake", - "version-date": "2022-03-29" + "version-date": "2022-03-29", "license": "MIT" } From 91e3b41055af61d9732a0db9399c8673f8a967ef Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 31 Mar 2022 00:14:47 +0200 Subject: [PATCH 07/14] version stuff --- 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 ee67b10eaf96ee..c08d3e87ba1782 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7261,7 +7261,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-02-14", + "baseline": "2022-03-29", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 56a6f595e74967..d778e2bf93a05d 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fed8892325765160ba215639ac7dfd1d8e17c025", + "version-date": "2022-03-29", + "port-version": 0 + }, { "git-tree": "bdfdf28cf28bc07d02af864315ca291dcfae180b", "version-date": "2022-02-14", From 030b15892b1d6af84ee19cbf55486ce96a520ba8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 4 Apr 2022 19:11:06 +0200 Subject: [PATCH 08/14] CR scripts/cmake/vcpkg_configure_cmake.cmake Co-authored-by: nicole mazzuca --- scripts/cmake/vcpkg_configure_cmake.cmake | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 8d07bfe8835afc..111944551625fa 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -98,8 +98,18 @@ function(z_vcpkg_configure_cmake_build_cmakecache out_var whereat build_type) set("${out_var}" "${${out_var}}${line}\"\n\n" PARENT_SCOPE) endfunction() -function(z_vcpkg_get_visual_studio_generator generator_var arch_var) - set(arch "") +function(z_vcpkg_get_visual_studio_generator) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "OUT_GENERATOR;OUT_ARCH" "") + + if (NOT DEFINED arg_OUT_GENERATOR) + message(FATAL_ERROR "OUT_GENERATOR must be defined.") + endif() + if(NOT DEFINED arg_OUT_ARCH) + message(FATAL_ERROR "OUT_ARCH must be defined.") + endif() + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() if(VCPKG_PLATFORM_TOOLSET STREQUAL "v120") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(generator "Visual Studio 12 2013") From 39b142ff7473001f05bdd6858b044b7945f2d08b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 4 Apr 2022 19:15:10 +0200 Subject: [PATCH 09/14] CR changes --- ports/vcpkg-cmake/vcpkg.json | 2 +- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 2 +- scripts/cmake/vcpkg_configure_cmake.cmake | 75 ++++++------------- 3 files changed, 23 insertions(+), 56 deletions(-) diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index e797a34676ca61..4955b0d7630122 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,5 @@ { "name": "vcpkg-cmake", - "version-date": "2022-03-29", + "version-date": "2022-04-04", "license": "MIT" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index ae85cb7c3096f8..ed312a05d53a73 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -165,7 +165,7 @@ function(vcpkg_cmake_configure) elseif(arg_WINDOWS_USE_MSBUILD OR NOT ninja_can_be_used) set(generator "") set(arch "") - z_vcpkg_get_visual_studio_generator(generator arch) + z_vcpkg_get_visual_studio_generator(OUT_GENERATOR generator OUT_ARCH arch) endif() if(NOT generator) diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 111944551625fa..7f139a4b989719 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -110,62 +110,29 @@ function(z_vcpkg_get_visual_studio_generator) if(DEFINED arg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - if(VCPKG_PLATFORM_TOOLSET STREQUAL "v120") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(generator "Visual Studio 12 2013") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(generator "Visual Studio 12 2013 Win64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(generator "Visual Studio 12 2013 ARM") - endif() - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v140") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(generator "Visual Studio 14 2015") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(generator "Visual Studio 14 2015 Win64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(generator "Visual Studio 14 2015 ARM") - endif() - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v141") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(generator "Visual Studio 15 2017") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(generator "Visual Studio 15 2017 Win64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(generator "Visual Studio 15 2017 ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(generator "Visual Studio 15 2017") - set(arch "ARM64") - endif() - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v142") + if("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v120" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + set(generator "Visual Studio 12 2013") + elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v140" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + set(generator "Visual Studio 14 2015") + elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v141") + set(generator "Visual Studio 15 2017") + elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v142") set(generator "Visual Studio 16 2019") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(arch "Win32") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(arch "x64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(arch "ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(arch "ARM64") - else() - set(generator "") - endif() - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v143") + elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v143") set(generator "Visual Studio 17 2022") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(arch "Win32") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(arch "x64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(arch "ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(arch "ARM64") - else() - set(generator "") - endif() endif() - set(${generator_var} "${generator}" PARENT_SCOPE) - set(${arch_var} "${arch}" PARENT_SCOPE) + + if("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x86") + set(generator_arch "Win32") + elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x64") + set(generator_arch "x64") + elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm") + set(generator_arch "ARM") + elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + set(generator_arch "ARM64") + endif() + set(${arg_OUT_GENERATOR} "${generator}" PARENT_SCOPE) + set(${arg_OUT_ARCH} "${generator_arch}" PARENT_SCOPE) endfunction() function(z_vcpkg_select_default_vcpkg_chainload_toolchain) @@ -264,7 +231,7 @@ function(vcpkg_configure_cmake) set(generator "${arg_GENERATOR}") elseif(NOT ninja_can_be_used) set(generator "") - z_vcpkg_get_visual_studio_generator(generator generator_arch) + z_vcpkg_get_visual_studio_generator(OUT_GENERATOR generator OUT_ARCH generator_arch) if("${generator}" STREQUAL "" OR "${generator_arch}" STREQUAL "") message(FATAL_ERROR "Unable to determine appropriate generator for triplet ${TARGET_TRIPLET}: From 2cc27c70dc2a03fbc323e5e29d7167f69baf0951 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 4 Apr 2022 19:16:06 +0200 Subject: [PATCH 10/14] revert baseline --- versions/baseline.json | 2 +- versions/v-/vcpkg-cmake.json | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index d66b6d10c63097..9b5c1056e7a70b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7261,7 +7261,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-03-29", + "baseline": "2022-02-14", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index d778e2bf93a05d..56a6f595e74967 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "fed8892325765160ba215639ac7dfd1d8e17c025", - "version-date": "2022-03-29", - "port-version": 0 - }, { "git-tree": "bdfdf28cf28bc07d02af864315ca291dcfae180b", "version-date": "2022-02-14", From 7da97a9b7151d0acb4f817ca0bca6511cd5b87b2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 4 Apr 2022 19:16:36 +0200 Subject: [PATCH 11/14] update version --- 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 9b5c1056e7a70b..a54eb936536cc8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7261,7 +7261,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-02-14", + "baseline": "2022-04-04", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 56a6f595e74967..5d4fa5247d7467 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a24f947aaa846f93a0102baaf4569da1168b0014", + "version-date": "2022-04-04", + "port-version": 0 + }, { "git-tree": "bdfdf28cf28bc07d02af864315ca291dcfae180b", "version-date": "2022-02-14", From 8cb5e82f3bc5402770a7ae70603498533bb95d66 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 7 Apr 2022 15:43:37 +0200 Subject: [PATCH 12/14] bump version --- ports/vcpkg-cmake/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index cc7dd6bd0b36ac..dbfc761c446ec4 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,5 @@ { "name": "vcpkg-cmake", - "version-date": "2022-04-05", + "version-date": "2022-04-07", "license": "MIT" } From 6d4bb79757279b73485335a5d315ac856374e51d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 7 Apr 2022 15:44:14 +0200 Subject: [PATCH 13/14] version stuff --- 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 3e1afbc333755f..4f0fc11fd06322 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7277,7 +7277,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-04-05", + "baseline": "2022-04-07", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index a5fd961e588c33..fb83ccdf337642 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3dcb01563c0de941013579456d19ce5b0bd08a6e", + "version-date": "2022-04-07", + "port-version": 0 + }, { "git-tree": "34d8604d164edd2903bdb833adf30fe1516c9982", "version-date": "2022-04-05", From d3d58bbbc0cf8b8d1a6ee51edc5876e87f8a7f08 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 8 Apr 2022 13:20:46 +0200 Subject: [PATCH 14/14] ci retrigger