From 07f768b3f1b5f524f819424aa0bd2b14be8d9a4a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 28 Jan 2022 00:10:08 +0100 Subject: [PATCH 01/59] uwp magic with ninja --- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 5 +- scripts/cmake/vcpkg_configure_cmake.cmake | 9 +++- scripts/cmake/vcpkg_configure_make.cmake | 14 +++-- scripts/cmake/vcpkg_configure_meson.cmake | 6 ++- scripts/get_cmake_vars/CMakeLists.txt | 7 ++- scripts/toolchains/uwp.cmake | 52 +++++++++++++++++++ 6 files changed, 83 insertions(+), 10 deletions(-) create mode 100644 scripts/toolchains/uwp.cmake diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index b5241d5270e827..c39e97bd56aeba 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -156,7 +156,8 @@ function(vcpkg_cmake_configure) set(ninja_host OFF) 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) + # set(ninja_can_be_used OFF) + # Nonsense windows.cmake does just not correctly setup the compiler flags for UWP and Ninja endif() set(generator) @@ -282,6 +283,8 @@ function(vcpkg_cmake_configure) 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_UWP) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/uwp.cmake") elseif(VCPKG_TARGET_IS_WINDOWS) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") elseif(VCPKG_TARGET_IS_LINUX) diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 84a8d1e2786867..da09f4f1856e0e 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -155,7 +155,8 @@ function(vcpkg_configure_cmake) set(ninja_host OFF) elseif(VCPKG_TARGET_IS_UWP) # Ninja and MSBuild have many differences when targeting UWP, so use MSBuild to maximize existing compatibility - set(ninja_can_be_used OFF) + # set(ninja_can_be_used OFF) + # Nonsense windows.cmake does just not correctly setup the compiler flags for UWP and Ninja endif() endif() @@ -245,7 +246,11 @@ function(vcpkg_configure_cmake) 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") + if(VCPKG_TARGET_IS_UWP) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/uwp.cmake") + else() + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") + endif() elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index aa054222c7dedc..bfb2520deb7a8b 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -236,6 +236,7 @@ function(vcpkg_configure_make) z_vcpkg_get_cmake_vars(cmake_vars_file) debug_message("Including cmake vars from: ${cmake_vars_file}") include("${cmake_vars_file}") + if(DEFINED VCPKG_MAKE_BUILD_TRIPLET) set(arg_BUILD_TRIPLET ${VCPKG_MAKE_BUILD_TRIPLET}) # Triplet overwrite for crosscompiling endif() @@ -540,12 +541,15 @@ function(vcpkg_configure_make) # IMPORTANT: The only way to pass linker flags through libtool AND the compile wrapper # is to use the CL and LINK environment variables !!! # (This is due to libtool and compiler wrapper using the same set of options to pass those variables around) - string(REPLACE "\\" "/" VCToolsInstallDir "$ENV{VCToolsInstallDir}") + file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" VCToolsInstallDir) + set(_replacement -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG "${VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE "${VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE}") # Can somebody please check if CMake's compiler flags for UWP are correct? - set(ENV{_CL_} "$ENV{_CL_} /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB_ -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\"") - string(APPEND VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE " -ZW:nostdlib") - string(APPEND VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG " -ZW:nostdlib") - set(ENV{_LINK_} "$ENV{_LINK_} ${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES} /MANIFEST /DYNAMICBASE /WINMD:NO /APPCONTAINER") + set(ENV{_CL_} "$ENV{_CL_} -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\"") + set(ENV{_LINK_} "$ENV{_LINK_} ${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") endif() endif() diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 02e189b3140dad..d4d4fb051f702d 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -196,7 +196,11 @@ function(z_vcpkg_meson_generate_native_file_config config_type) #https://mesonbu 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") + if(VCPKG_TARGET_IS_UWP) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/uwp.cmake") + else() + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") + endif() elseif(VCPKG_TARGET_IS_LINUX) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") elseif(VCPKG_TARGET_IS_ANDROID) diff --git a/scripts/get_cmake_vars/CMakeLists.txt b/scripts/get_cmake_vars/CMakeLists.txt index b6d5f0e4154d46..a3ee2db8907740 100644 --- a/scripts/get_cmake_vars/CMakeLists.txt +++ b/scripts/get_cmake_vars/CMakeLists.txt @@ -92,12 +92,16 @@ endforeach() macro(_vcpkg_adjust_flags flag_var) if(MSVC) # Transform MSVC /flags to -flags due to bash scripts intepreting /flag as a path. string(REGEX REPLACE "(^| )/" "\\1-" ${flag_var} "${${flag_var}}") + if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + foreach("${flag_var}" IN_LIST CMAKE_C_FLAGS CMAKE_CXX_FLAGS) + string(APPEND ${flag_var} " -ZW:nostdlib") + endforeach() + endif() endif() if(CMAKE_SYSTEM_NAME MATCHES "Darwin") if("${flag_var}" IN_LIST VCPKG_LANG_FLAGS) # macOS - append arch and isysroot if cross-compiling if(NOT "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "${CMAKE_HOST_SYSTEM_PROCESSOR}") - foreach(arch IN LISTS CMAKE_OSX_ARCHITECTURES) string(APPEND ${flag_var} " -arch ${arch}") endforeach() @@ -110,6 +114,7 @@ endmacro() foreach(flag IN LISTS VCPKG_FLAGS_TO_CHECK) string(STRIP "${${flag}}" ${flag}) # Strip leading and trailing whitespaces _vcpkg_adjust_flags(${flag}) + string(REPLACE [[\\]] [[\]] ${flag} "${${flag}}") string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_RAW_${flag} \" ${${flag}}\")\n") foreach(config IN LISTS VCPKG_CONFIGS) string(STRIP "${${flag}_${config}}" ${flag}_${config}) diff --git a/scripts/toolchains/uwp.cmake b/scripts/toolchains/uwp.cmake new file mode 100644 index 00000000000000..71abb8d8cdd216 --- /dev/null +++ b/scripts/toolchains/uwp.cmake @@ -0,0 +1,52 @@ +if(NOT _VCPKG_WINDOWS_TOOLCHAIN) +set(_VCPKG_WINDOWS_TOOLCHAIN 1) +set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>$<$:DLL>" CACHE STRING "") + +get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) +if(NOT _CMAKE_IN_TRY_COMPILE) + + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(VCPKG_CRT_LINK_FLAG_PREFIX "/MD") + elseif(VCPKG_CRT_LINKAGE STREQUAL "static") + set(VCPKG_CRT_LINK_FLAG_PREFIX "/MT") + else() + message(FATAL_ERROR "Invalid setting for VCPKG_CRT_LINKAGE: \"${VCPKG_CRT_LINKAGE}\". It must be \"static\" or \"dynamic\"") + endif() + + set(_vcpkg_charset "/utf-8") + if (NOT VCPKG_SET_CHARSET_FLAG OR VCPKG_PLATFORM_TOOLSET MATCHES "v120") + # VS 2013 does not support /utf-8 + set(_vcpkg_charset "") + endif() + + set(_vcpkg_cpp_flags "/DWIN32 /D_WINDOWS /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB__" ) # VS adds /D "_WINDLL" for DLLs; + set(_vcpkg_common_flags "/nologo /Z7 /MP /sdl /GS /Gd /Gm- /W3 /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /WX- /Oy- /EHsc") #/ZW:nostdlib -> ZW is added by CMake + file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools) + set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps + + set(CMAKE_CXX_FLAGS "${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_CXX_FLAGS}" CACHE STRING "") + set(CMAKE_C_FLAGS "${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_C_FLAGS}" CACHE STRING "") + set(CMAKE_RC_FLAGS "-c65001 ${_vcpkg_cpp_flags}" CACHE STRING "") + + unset(_vcpkg_charset) + unset(_vcpkg_cpp_flags) + unset(_vcpkg_common_flags) + unset(_vcpkg_winmd_flag) + + set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /RTC1 ${VCPKG_CRT_LINK_FLAG_PREFIX}d ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") + set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /Od /RTC1 ${VCPKG_CRT_LINK_FLAG_PREFIX}d ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") + + set(CMAKE_CXX_FLAGS_RELEASE "/Gy /O2 /Oi ${VCPKG_CRT_LINK_FLAG_PREFIX} ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") # VS adds /GL + set(CMAKE_C_FLAGS_RELEASE "/Gy /O2 /Oi ${VCPKG_CRT_LINK_FLAG_PREFIX} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") + + string(APPEND CMAKE_STATIC_LINKER_FLAGS_RELEASE_INIT " /nologo ") # VS adds /LTCG + string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE WindowsApp.lib /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO /NOLOGO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") # VS adds /DEBUG:FULL /TLBID:1. + string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE WindowsApp.lib /DEBUG /WINMD /APPCONTAINER /MANIFESTUAC:NO /NOLOGO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") # VS adds /DEBUG:FULL /TLBID:1. + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") # VS uses /LTCG:incremental + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") + + string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT " /nologo ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " /nologo ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ") +endif() +endif() From 10fddd0f80e97f3542779d712bfbfb00ab02de4d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 31 Jan 2022 11:47:44 +0100 Subject: [PATCH 02/59] fine tuning --- scripts/toolchains/uwp.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/toolchains/uwp.cmake b/scripts/toolchains/uwp.cmake index 71abb8d8cdd216..c58022db86c111 100644 --- a/scripts/toolchains/uwp.cmake +++ b/scripts/toolchains/uwp.cmake @@ -20,7 +20,8 @@ if(NOT _CMAKE_IN_TRY_COMPILE) endif() set(_vcpkg_cpp_flags "/DWIN32 /D_WINDOWS /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB__" ) # VS adds /D "_WINDLL" for DLLs; - set(_vcpkg_common_flags "/nologo /Z7 /MP /sdl /GS /Gd /Gm- /W3 /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /WX- /Oy- /EHsc") #/ZW:nostdlib -> ZW is added by CMake + set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc") + #/ZW:nostdlib -> ZW is added by CMake # VS also normally adds /sdl but not cmake MSBUILD file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools) set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps @@ -40,8 +41,8 @@ if(NOT _CMAKE_IN_TRY_COMPILE) set(CMAKE_C_FLAGS_RELEASE "/Gy /O2 /Oi ${VCPKG_CRT_LINK_FLAG_PREFIX} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") string(APPEND CMAKE_STATIC_LINKER_FLAGS_RELEASE_INIT " /nologo ") # VS adds /LTCG - string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE WindowsApp.lib /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO /NOLOGO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") # VS adds /DEBUG:FULL /TLBID:1. - string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE WindowsApp.lib /DEBUG /WINMD /APPCONTAINER /MANIFESTUAC:NO /NOLOGO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") # VS adds /DEBUG:FULL /TLBID:1. + string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE WindowsApp.lib /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") # VS adds /DEBUG:FULL /TLBID:1. + string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE WindowsApp.lib /DEBUG /WINMD /APPCONTAINER /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") # VS adds /DEBUG:FULL /TLBID:1. set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") # VS uses /LTCG:incremental set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") From 12c87a6e2c3179265a3f5dc9fddafd64673511da Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 31 Jan 2022 19:52:32 +0100 Subject: [PATCH 03/59] more fine tuning also fix bug in build_make --- scripts/cmake/vcpkg_build_make.cmake | 4 ++-- scripts/cmake/vcpkg_configure_make.cmake | 2 +- scripts/toolchains/uwp.cmake | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 787471e19d145c..13a5961503fac2 100755 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -164,9 +164,9 @@ function(vcpkg_build_make) vcpkg_host_path_list(PREPEND ENV{LIBRARY_PATH} "${Z_VCPKG_INSTALLED}${path_suffix_${buildtype}}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link/") #vcpkg_host_path_list(PREPEND ENV{LD_LIBRARY_PATH} "${Z_VCPKG_INSTALLED}${path_suffix}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix_${buildtype}}/lib/manual-link/") - if(LINK_ENV_${_VAR_SUFFIX}) + if(LINK_ENV_${cmake_buildtype}) set(config_link_backup "$ENV{_LINK_}") - set(ENV{_LINK_} "${LINK_ENV_${_VAR_SUFFIX}}") + set(ENV{_LINK_} "${LINK_ENV_${cmake_buildtype}}") endif() if(arg_ADD_BIN_TO_PATH) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index bfb2520deb7a8b..7c31279492afa7 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -708,7 +708,7 @@ function(vcpkg_configure_make) set(LINK_ENV_${var_suffix} "${LINKER_FLAGS_${var_suffix}}") endif() else() - set(link_required_dirs) + set(link_required_dirs "") if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib") set(link_required_dirs "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib") endif() diff --git a/scripts/toolchains/uwp.cmake b/scripts/toolchains/uwp.cmake index c58022db86c111..d51a99ecb4f6a9 100644 --- a/scripts/toolchains/uwp.cmake +++ b/scripts/toolchains/uwp.cmake @@ -25,8 +25,8 @@ if(NOT _CMAKE_IN_TRY_COMPILE) file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools) set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps - set(CMAKE_CXX_FLAGS "${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_CXX_FLAGS}" CACHE STRING "") - set(CMAKE_C_FLAGS "${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_C_FLAGS}" CACHE STRING "") + set(CMAKE_CXX_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_CXX_FLAGS}" CACHE STRING "") + set(CMAKE_C_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_C_FLAGS}" CACHE STRING "") set(CMAKE_RC_FLAGS "-c65001 ${_vcpkg_cpp_flags}" CACHE STRING "") unset(_vcpkg_charset) @@ -41,8 +41,10 @@ if(NOT _CMAKE_IN_TRY_COMPILE) set(CMAKE_C_FLAGS_RELEASE "/Gy /O2 /Oi ${VCPKG_CRT_LINK_FLAG_PREFIX} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") string(APPEND CMAKE_STATIC_LINKER_FLAGS_RELEASE_INIT " /nologo ") # VS adds /LTCG - string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE WindowsApp.lib /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") # VS adds /DEBUG:FULL /TLBID:1. - string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE WindowsApp.lib /DEBUG /WINMD /APPCONTAINER /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") # VS adds /DEBUG:FULL /TLBID:1. + string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") + # VS adds /DEBUG:FULL /TLBID:1. WindowsApp.lib is in CMAKE_C|CXX_STANDARD_LIBRARIES + string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD /APPCONTAINER /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") + # VS adds /DEBUG:FULL /TLBID:1. set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") # VS uses /LTCG:incremental set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") From 20e35aedcae2cfc662af3a7bf93d030b080423d9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 31 Jan 2022 20:05:23 +0100 Subject: [PATCH 04/59] more fixes --- scripts/cmake/vcpkg_build_make.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 13a5961503fac2..dd5b8c696c7afe 100755 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -142,9 +142,9 @@ function(vcpkg_build_make) z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags("${cmake_buildtype}") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_STATIC_LINKER_FLAGS_${cmake_buildtype}}") + set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${cmake_buildtype}}") else() # dynamic - set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_SHARED_LINKER_FLAGS_${cmake_buildtype}}") + set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${cmake_buildtype}}") endif() if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") set(LDFLAGS_${cmake_buildtype} "-L${Z_VCPKG_INSTALLED}${path_suffix}/lib -L${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link") From e7de7d7c191be8310a08a16cdb183a2b2495f381 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 31 Jan 2022 20:24:34 +0100 Subject: [PATCH 05/59] more fixes --- scripts/cmake/vcpkg_build_make.cmake | 13 +++++++++---- scripts/cmake/vcpkg_configure_make.cmake | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index dd5b8c696c7afe..23d872efff3409 100755 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -159,10 +159,15 @@ function(vcpkg_build_make) set(ENV{CXXFLAGS} "${CXXFLAGS_${cmake_buildtype}}") set(ENV{RCFLAGS} "${VCPKG_DETECTED_CMAKE_RC_FLAGS_${cmake_buildtype}}") set(ENV{LDFLAGS} "${LDFLAGS_${cmake_buildtype}}") - vcpkg_host_path_list(PREPEND ENV{LIB} "${Z_VCPKG_INSTALLED}${path_suffix}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link/") - vcpkg_host_path_list(PREPEND ENV{LIBPATH} "${Z_VCPKG_INSTALLED}${path_suffix}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link/") - vcpkg_host_path_list(PREPEND ENV{LIBRARY_PATH} "${Z_VCPKG_INSTALLED}${path_suffix_${buildtype}}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link/") - #vcpkg_host_path_list(PREPEND ENV{LD_LIBRARY_PATH} "${Z_VCPKG_INSTALLED}${path_suffix}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix_${buildtype}}/lib/manual-link/") + vcpkg_list(APPEND lib_env_vars LIB LIBPATH LIBRARY_PATH) # LD_LIBRARY_PATH) + foreach(lib_env_var IN LISTS lib_env_vars) + if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib") + vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${CURRENT_INSTALLED_DIR}${path_suffix_${buildtype}}/lib") + endif() + if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib/manual-link") + vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${CURRENT_INSTALLED_DIR}${path_suffix_${buildtype}}/lib/manual-link") + endif() + endforeach() if(LINK_ENV_${cmake_buildtype}) set(config_link_backup "$ENV{_LINK_}") diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 7c31279492afa7..efea14af48dffd 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -783,7 +783,7 @@ function(vcpkg_configure_make) vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib") endif() if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib/manual-link") - vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${CURRENT_INSTALLED_DIR}" "${path_suffix_${current_buildtype}}/lib/manual-link") + vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib/manual-link") endif() endforeach() unset(lib_env_vars) From 396ce9422075ced49c127ed12e9eef67b6a612d1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 31 Mar 2022 00:06:34 +0200 Subject: [PATCH 06/59] adjust uwp build in boost --- ports/boost-modular-build-helper/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index 368c601748784c..6c95850b8779f9 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -97,9 +97,9 @@ if(VCPKG_DETECTED_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") list(TRANSFORM libpath_args APPEND "\"") list(JOIN libpath_args " " libpath_arg) - string(APPEND CXXFLAGS " /ZW") + #string(APPEND CXXFLAGS " /ZW") string(APPEND COMPILEFLAGS " ${libpath_arg} /D_WIN32_WINNT=0x0A00") - string(APPEND CFLAGS " -Zl") + #string(APPEND CFLAGS " -Zl") list(APPEND B2_OPTIONS windows-api=store) list(APPEND B2_OPTIONS linkflags=WindowsApp.lib) endif() From 449726e6e435f9fe34f3cd4f1146cb4c1b032e31 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 31 Mar 2022 11:28:29 +0200 Subject: [PATCH 07/59] fix blas --- ports/blas/CMakeLists.txt | 2 +- ports/blas/portfile.cmake | 2 +- ports/blas/vcpkg.json | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/blas/CMakeLists.txt b/ports/blas/CMakeLists.txt index 790f79e8baa70e..72eed951867d3e 100644 --- a/ports/blas/CMakeLists.txt +++ b/ports/blas/CMakeLists.txt @@ -1,4 +1,4 @@ cmake_minimum_required(VERSION 3.17) -project(Find_BLAS_external) +project(Find_BLAS_external LANGUAGES CXX) find_package(BLAS REQUIRED) diff --git a/ports/blas/portfile.cmake b/ports/blas/portfile.cmake index f70aa46eabd3fb..e668d3e4beaea1 100644 --- a/ports/blas/portfile.cmake +++ b/ports/blas/portfile.cmake @@ -1,5 +1,5 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) # Make sure BLAS can be found -vcpkg_configure_cmake(SOURCE_PATH ${CURRENT_PORT_DIR} +vcpkg_cmake_configure(SOURCE_PATH ${CURRENT_PORT_DIR} OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}") diff --git a/ports/blas/vcpkg.json b/ports/blas/vcpkg.json index aca4cf894e418c..8ff9563027fd06 100644 --- a/ports/blas/vcpkg.json +++ b/ports/blas/vcpkg.json @@ -4,6 +4,10 @@ "port-version": 1, "description": "Metapackage for packages which provide BLAS", "dependencies": [ - "openblas" + "openblas", + { + "name": "vcpkg-cmake", + "host": true + } ] } From db86cd3dc4a46d5248f9180a403deae5f78d8cf1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 31 Mar 2022 11:29:07 +0200 Subject: [PATCH 08/59] version stuff --- ports/blas/vcpkg.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/blas/vcpkg.json b/ports/blas/vcpkg.json index 8ff9563027fd06..957fa55978d7af 100644 --- a/ports/blas/vcpkg.json +++ b/ports/blas/vcpkg.json @@ -1,7 +1,6 @@ { "name": "blas", - "version-string": "1", - "port-version": 1, + "version-date": "2022-03-31", "description": "Metapackage for packages which provide BLAS", "dependencies": [ "openblas", From fe05c1ff4f901578551e24f0f7193f23473f3445 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 31 Mar 2022 11:29:19 +0200 Subject: [PATCH 09/59] more version stuff --- versions/b-/blas.json | 5 +++++ versions/baseline.json | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/b-/blas.json b/versions/b-/blas.json index c8b3ade64a24bc..4b5504b0d48d00 100644 --- a/versions/b-/blas.json +++ b/versions/b-/blas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7aa1a398b27db16f88c13e161e4d758ce55fd56", + "version-date": "2022-03-31", + "port-version": 0 + }, { "git-tree": "0d105be9337f4a6f294a7eced2da18e8cdb99051", "version-string": "1", diff --git a/versions/baseline.json b/versions/baseline.json index ee67b10eaf96ee..00c6d0f6c94ec4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -485,8 +485,8 @@ "port-version": 0 }, "blas": { - "baseline": "1", - "port-version": 1 + "baseline": "2022-03-31", + "port-version": 0 }, "blaze": { "baseline": "3.8", From 3991cb7967ae77d6f0dbce4ad2845ec18ca04ad5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 31 Mar 2022 12:37:03 +0200 Subject: [PATCH 10/59] fix some regressions --- ports/cpprestsdk/portfile.cmake | 20 ++++++++++++-------- ports/cpprestsdk/vcpkg.json | 10 +++++++++- ports/libcerf/portfile.cmake | 16 ++++++++++------ ports/libcerf/vcpkg.json | 12 +++++++++--- ports/liblbfgs/portfile.cmake | 13 ++++++------- ports/liblbfgs/vcpkg.json | 10 ++++++++-- ports/sdl2/portfile.cmake | 5 +++++ ports/sdl2/vcpkg.json | 2 +- scripts/ci.baseline.txt | 1 - scripts/toolchains/uwp.cmake | 8 ++++++-- 10 files changed, 66 insertions(+), 31 deletions(-) diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake index 4682018089808b..666cb1c0b89a6c 100644 --- a/ports/cpprestsdk/portfile.cmake +++ b/ports/cpprestsdk/portfile.cmake @@ -23,9 +23,13 @@ vcpkg_check_features( websockets CPPREST_EXCLUDE_WEBSOCKETS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/Release - PREFER_NINJA +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/Release" + ${configure_opts} OPTIONS ${OPTIONS} ${FEATURE_OPTIONS} @@ -38,16 +42,16 @@ vcpkg_configure_cmake( -DCPPREST_INSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/share/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/share" "${CURRENT_PACKAGES_DIR}/lib/share") if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/cpprest/details/cpprest_compat.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cpprest/details/cpprest_compat.h" "#ifdef _NO_ASYNCRTIMP" "#if 1") endif() -file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cpprestsdk/vcpkg.json b/ports/cpprestsdk/vcpkg.json index d33e61ed9345aa..98b5637bda52f2 100644 --- a/ports/cpprestsdk/vcpkg.json +++ b/ports/cpprestsdk/vcpkg.json @@ -1,12 +1,20 @@ { "name": "cpprestsdk", - "version-string": "2.10.18", + "version": "2.10.18", "description": [ "C++11 JSON, REST, and OAuth library", "The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services." ], "homepage": "https://github.com/Microsoft/cpprestsdk", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, { "name": "boost-asio", "platform": "!uwp & !windows" diff --git a/ports/libcerf/portfile.cmake b/ports/libcerf/portfile.cmake index 1054bf5c8c73d8..aada71bd497d98 100644 --- a/ports/libcerf/portfile.cmake +++ b/ports/libcerf/portfile.cmake @@ -16,18 +16,22 @@ vcpkg_extract_source_archive_ex( PATCHES 001-fix-static-build.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ${configure_opts} OPTIONS -DCERF_CPP=ON -DLIB_MAN=OFF -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcerf RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libcerf" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/ports/libcerf/vcpkg.json b/ports/libcerf/vcpkg.json index 3d134faac927e6..1ec392779c9a56 100644 --- a/ports/libcerf/vcpkg.json +++ b/ports/libcerf/vcpkg.json @@ -1,7 +1,13 @@ { "name": "libcerf", - "version-string": "1.13", - "port-version": 2, + "version": "1.13", + "port-version": 3, "description": "A self-contained numeric library that provides an efficient and accurate implementation of complex error functions, along with Dawson, Faddeeva, and Voigt functions.", - "homepage": "https://jugit.fz-juelich.de/mlz/libcerf" + "homepage": "https://jugit.fz-juelich.de/mlz/libcerf", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/liblbfgs/portfile.cmake b/ports/liblbfgs/portfile.cmake index 5e7e34e55bdf91..a793a23d9a1746 100644 --- a/ports/liblbfgs/portfile.cmake +++ b/ports/liblbfgs/portfile.cmake @@ -8,15 +8,14 @@ vcpkg_from_github( message(STATUS "source path is : ${SOURCE_PATH}") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFIX_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblbfgs RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/liblbfgs" RENAME copyright) \ No newline at end of file diff --git a/ports/liblbfgs/vcpkg.json b/ports/liblbfgs/vcpkg.json index d648f802752b18..08276d758abb55 100644 --- a/ports/liblbfgs/vcpkg.json +++ b/ports/liblbfgs/vcpkg.json @@ -1,7 +1,13 @@ { "name": "liblbfgs", "version-string": "1.10", - "port-version": 1, + "port-version": 2, "description": "libLBFGS: a library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)", - "homepage": "http://www.chokkan.org/software/liblbfgs/" + "homepage": "http://www.chokkan.org/software/liblbfgs/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 67c43d4bbb146b..aeb204541004b3 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -32,8 +32,13 @@ if ("x11" IN_LIST FEATURES) message(WARNING "You will need to install Xorg dependencies to use feature x11:\nsudo apt install libx11-dev libxft-dev libxext-dev\n") endif() +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + ${configure_opts} OPTIONS ${FEATURE_OPTIONS} -DSDL_STATIC=${SDL_STATIC} -DSDL_SHARED=${SDL_SHARED} diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index af004284078537..b4e41ddb8e8e44 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2", "version": "2.0.20", - "port-version": 1, + "port-version": 2, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", "dependencies": [ diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1f58327463eb07..267ba812d4cb7d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -60,7 +60,6 @@ blitz:arm64-windows=fail blitz:arm-uwp=fail blosc:arm64-windows=fail blosc:arm-uwp=fail -blosc:x64-uwp=fail bond:arm-uwp=fail bond:x64-osx=fail bond:x64-uwp=fail diff --git a/scripts/toolchains/uwp.cmake b/scripts/toolchains/uwp.cmake index d51a99ecb4f6a9..f728625045df98 100644 --- a/scripts/toolchains/uwp.cmake +++ b/scripts/toolchains/uwp.cmake @@ -22,8 +22,12 @@ if(NOT _CMAKE_IN_TRY_COMPILE) set(_vcpkg_cpp_flags "/DWIN32 /D_WINDOWS /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB__" ) # VS adds /D "_WINDLL" for DLLs; set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc") #/ZW:nostdlib -> ZW is added by CMake # VS also normally adds /sdl but not cmake MSBUILD - file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools) - set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps + set(_vcpkg_winmd_flag "") + if(CMAKE_GENERATOR MATCHES "Ninja") + file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools) + set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps + endif() + set(CMAKE_CXX_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_CXX_FLAGS}" CACHE STRING "") set(CMAKE_C_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_C_FLAGS}" CACHE STRING "") From a9ae1efd9665f4f9f8b4401ece0ee4be35f73a1e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 31 Mar 2022 12:44:33 +0200 Subject: [PATCH 11/59] format stuff --- ports/cpprestsdk/vcpkg.json | 16 ++++++++-------- ports/libcerf/vcpkg.json | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ports/cpprestsdk/vcpkg.json b/ports/cpprestsdk/vcpkg.json index 98b5637bda52f2..58d020e824c86e 100644 --- a/ports/cpprestsdk/vcpkg.json +++ b/ports/cpprestsdk/vcpkg.json @@ -7,14 +7,6 @@ ], "homepage": "https://github.com/Microsoft/cpprestsdk", "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, { "name": "boost-asio", "platform": "!uwp & !windows" @@ -50,6 +42,14 @@ { "name": "openssl", "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ diff --git a/ports/libcerf/vcpkg.json b/ports/libcerf/vcpkg.json index 1ec392779c9a56..2788bc96d2ab9b 100644 --- a/ports/libcerf/vcpkg.json +++ b/ports/libcerf/vcpkg.json @@ -4,10 +4,10 @@ "port-version": 3, "description": "A self-contained numeric library that provides an efficient and accurate implementation of complex error functions, along with Dawson, Faddeeva, and Voigt functions.", "homepage": "https://jugit.fz-juelich.de/mlz/libcerf", - "dependencies": [ - { + "dependencies": [ + { "name": "vcpkg-cmake", "host": true } - ] + ] } From f2fb380423d9d47bd6034cc34bf0eea2a7e4ee84 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 31 Mar 2022 22:55:39 +0200 Subject: [PATCH 12/59] cleanup baseline --- scripts/ci.baseline.txt | 54 ----------------------------------------- 1 file changed, 54 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1f58327463eb07..474f7d2a06b42a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -59,8 +59,6 @@ blitz:x64-uwp=fail blitz:arm64-windows=fail blitz:arm-uwp=fail blosc:arm64-windows=fail -blosc:arm-uwp=fail -blosc:x64-uwp=fail bond:arm-uwp=fail bond:x64-osx=fail bond:x64-uwp=fail @@ -97,8 +95,6 @@ catch-classic:x64-windows = skip catch-classic:x64-windows-static = skip catch-classic:x64-windows-static-md=skip catch-classic:x86-windows = skip -ccd:arm-uwp=fail -ccd:x64-uwp=fail cctag:x64-windows-static-md=fail cello:arm-uwp=fail cello:x64-uwp=fail @@ -126,8 +122,6 @@ chartdir:x86-windows=skip chartdir:x64-windows=skip chartdir:x64-windows-static-md=skip chartdir:x64-osx=skip -chmlib:arm-uwp=fail -chmlib:x64-uwp=fail # chromium-base has several problems and is upgraded to "skip" because it hits a lot of servers that can slow CI # broken on Windows because it does not yet support VS2022 @@ -266,8 +260,6 @@ embree2:x64-windows-static-md=skip # embree2 conflicts with embree3 embree2:x64-linux=skip embree2:x64-osx=skip -enet:arm-uwp=fail -enet:x64-uwp=fail epsilon:arm-uwp=fail epsilon:x64-uwp=fail epsilon:x64-windows-static=fail @@ -276,10 +268,6 @@ fastrtps:arm-uwp=fail fastrtps:x64-uwp=fail fastrtps:x64-windows-static=fail fastrtps:x64-windows-static-md=fail -fdlibm:arm-uwp=fail -fdlibm:x64-uwp=fail -fftw3:arm-uwp=fail -fftw3:x64-uwp=fail # fluidlite conflicts with fluidsynth; we test fluidsynth rather than fluidlite because # fluidlite has no dependencies and thus is less likely to be broken by another package. fluidlite:arm-uwp=skip @@ -291,8 +279,6 @@ fluidlite:x64-windows-static=skip fluidlite:x64-windows-static-md=skip fluidlite:x64-windows=skip fluidlite:x86-windows=skip -fmem:arm-uwp=fail -fmem:x64-uwp=fail fmi4cpp:arm-uwp=fail fmi4cpp:x64-uwp=fail fmilib:arm64-windows=fail @@ -375,12 +361,6 @@ gperftools:x64-uwp=fail gperftools:arm-uwp=fail graphicsmagick:arm-uwp=fail graphicsmagick:x64-uwp=fail -graphite2:arm-uwp=fail -graphite2:x64-uwp=fail -graphqlparser:arm-uwp=fail -graphqlparser:x64-uwp=fail -gsl:arm-uwp=fail -gsl:x64-uwp=fail gstreamer:x64-osx=fail gtk:x64-windows-static=fail gtk:x64-windows-static-md=fail @@ -397,8 +377,6 @@ healpix:x64-uwp=fail healpix:arm64-windows=fail healpix:arm-uwp=fail healpix:x64-osx=fail -hiredis:arm-uwp=fail -hiredis:x64-uwp=fail hpx:x64-windows-static=fail hpx:arm64-windows=fail hunspell:x64-windows-static-md=fail @@ -444,8 +422,6 @@ isal:x64-windows=fail isal:x64-windows-static=fail isal:x64-windows-static-md=fail isal:x86-windows=fail -jbig2dec:arm-uwp=fail -jbig2dec:x64-uwp=fail jemalloc:arm64-windows=fail jemalloc:arm-uwp=fail jemalloc:x64-linux=fail @@ -483,8 +459,6 @@ libbf:x64-windows=fail libbf:x64-windows-static=fail libbf:x64-windows-static-md=fail libbf:x86-windows=fail -libbson:arm-uwp=fail -libbson:x64-uwp=fail libcds:arm64-windows=fail libcds:arm-uwp=fail libcds:x64-uwp=fail @@ -522,8 +496,6 @@ libgpg-error:x64-uwp=fail libhdfs3:x64-linux=fail libhdfs3:x64-osx=fail libhydrogen:arm64-windows=fail -libics:arm-uwp=fail -libics:x64-uwp=fail libigl:arm64-windows=fail libigl:arm-uwp=fail libigl:x64-uwp=fail @@ -535,8 +507,6 @@ liblemon:arm-uwp=fail liblemon:x64-uwp=fail liblo:arm-uwp=fail liblo:x64-uwp=fail -libmad:arm-uwp=fail -libmad:x64-uwp=fail libmagic:x64-uwp=fail libmagic:arm64-windows=fail libmagic:arm-uwp=fail @@ -631,8 +601,6 @@ libsrt:x64-uwp=fail libssh:arm64-windows=fail libssh:arm-uwp=fail libssh:x64-uwp=fail -libstk:arm-uwp=fail -libstk:x64-uwp=fail libtcod:arm-uwp=fail libtcod:x64-uwp=fail libtins:arm-uwp=fail @@ -700,8 +668,6 @@ luajit:x86-windows = skip luafilesystem:arm-uwp=fail luafilesystem:x64-uwp=fail luasec:x64-windows-static=fail -luasocket:arm-uwp=fail -luasocket:x64-uwp=fail lzfse:arm-uwp=fail magnum:arm64-windows=skip marble:x64-windows-static=fail @@ -727,19 +693,13 @@ mesa:x64-windows-static-md=fail # Missing dependent libraries. mesa:x64-linux=fail mesa:x64-osx=fail -meschach:arm-uwp=fail meschach:x64-linux=fail meschach:x64-osx=fail -meschach:x64-uwp=fail -metis:arm-uwp=fail -metis:x64-uwp=fail mfl:x64-linux=skip mfl:x64-osx=skip milerius-sfml-imgui:x64-windows-static=fail minifb:arm-uwp=fail minifb:x64-uwp=fail -minisat-master-keying:arm-uwp=fail -minisat-master-keying:x64-uwp=fail miniupnpc:arm-uwp=fail miniupnpc:x64-uwp=fail minizip:arm-uwp=fail @@ -969,8 +929,6 @@ optional-bare:x64-windows-static-md=skip optional-bare:x86-windows = skip opusfile:arm-uwp=fail opusfile:x64-uwp=fail -orocos-kdl:arm-uwp=fail -orocos-kdl:x64-uwp=fail paho-mqtt:arm-uwp=fail paho-mqtt:x64-uwp=fail pango:x64-windows-static=fail @@ -998,20 +956,14 @@ pmdk:x64-osx=fail pmdk:x64-uwp=fail pmdk:x64-windows-static=fail pmdk:x86-windows=fail -pngwriter:arm-uwp=fail -pngwriter:x64-uwp=fail popsift:x64-windows-static-md=fail portable-snippets:arm-uwp=fail -pqp:arm-uwp=fail -pqp:x64-uwp=fail python2:arm64-windows=fail python2:arm-uwp=fail python2:x64-uwp=fail # Not yet ready for these platforms. qbittorrent:x64-osx=fail qbittorrent:x64-linux=fail -qhull:x64-uwp=fail -qhull:arm-uwp=fail qpid-proton:arm-uwp=fail qpid-proton:x64-uwp=fail qpid-proton:x64-windows-static=fail @@ -1064,8 +1016,6 @@ qwt:x64-osx=fail qwt-qt6:x64-osx=fail qwtw:x64-windows=fail rabit:x64-osx=fail -ragel:arm-uwp=fail -ragel:x64-uwp=fail range-v3-vs2015:arm64-windows = skip range-v3-vs2015:arm-uwp = skip range-v3-vs2015:x64-linux = skip @@ -1185,8 +1135,6 @@ septag-sx:arm64-windows=fail septag-sx:arm-uwp=fail septag-sx:x64-uwp=fail sfml:arm64-windows=fail -shapelib:arm-uwp=fail -shapelib:x64-uwp=fail shiva:x64-windows-static=fail shiva:x64-windows-static-md=fail shiva-sfml:x64-linux=fail @@ -1373,8 +1321,6 @@ xerces-c:arm-uwp=fail xerces-c:x64-uwp=fail xmlsec:arm-uwp=fail xmlsec:x64-uwp=fail -yajl:arm-uwp=fail -yajl:x64-uwp=fail yara:arm-uwp=fail yara:x64-uwp=fail z3:arm-uwp=fail From 5135de2cb0f6955eec50542b6bc3b62bcbb33aa6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 31 Mar 2022 23:00:17 +0200 Subject: [PATCH 13/59] fix physx --- ports/physx/portfile.cmake | 2 ++ ports/physx/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/physx/portfile.cmake b/ports/physx/portfile.cmake index 7fe812dc27b1ee..4c06666899ae7f 100644 --- a/ports/physx/portfile.cmake +++ b/ports/physx/portfile.cmake @@ -40,6 +40,7 @@ set(OPTIONS_DEBUG if(VCPKG_TARGET_IS_UWP) list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=uwp") + set(configure_options WINDOWS_USE_MSBUILD) elseif(VCPKG_TARGET_IS_WINDOWS) list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=windows") elseif(VCPKG_TARGET_IS_OSX) @@ -76,6 +77,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/physx/compiler/public" + ${configure_options} DISABLE_PARALLEL_CONFIGURE OPTIONS ${OPTIONS} OPTIONS_DEBUG ${OPTIONS_DEBUG} diff --git a/ports/physx/vcpkg.json b/ports/physx/vcpkg.json index fd3665a648d09c..aec7787acad4ab 100644 --- a/ports/physx/vcpkg.json +++ b/ports/physx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "physx", "version-semver": "4.1.2", - "port-version": 1, + "port-version": 2, "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs", "homepage": "https://github.com/NVIDIAGameWorks/PhysX", "supports": "!mingw", From 1665365030710585bb98fc38f43bb5528c4ffc44 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 1 Apr 2022 11:45:12 +0200 Subject: [PATCH 14/59] fine tuning --- scripts/toolchains/uwp.cmake | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/toolchains/uwp.cmake b/scripts/toolchains/uwp.cmake index f728625045df98..b5616fe21fadbe 100644 --- a/scripts/toolchains/uwp.cmake +++ b/scripts/toolchains/uwp.cmake @@ -23,11 +23,10 @@ if(NOT _CMAKE_IN_TRY_COMPILE) set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc") #/ZW:nostdlib -> ZW is added by CMake # VS also normally adds /sdl but not cmake MSBUILD set(_vcpkg_winmd_flag "") - if(CMAKE_GENERATOR MATCHES "Ninja") - file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools) - set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps - endif() - + file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools) + set(ENV{_CL_} "/FU\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\" $ENV{_CL_}") + # CMake has problems to correctly pass this in the compiler test so probably need special care in get_cmake_vars + #set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps set(CMAKE_CXX_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_CXX_FLAGS}" CACHE STRING "") set(CMAKE_C_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_C_FLAGS}" CACHE STRING "") @@ -45,13 +44,16 @@ if(NOT _CMAKE_IN_TRY_COMPILE) set(CMAKE_C_FLAGS_RELEASE "/Gy /O2 /Oi ${VCPKG_CRT_LINK_FLAG_PREFIX} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") string(APPEND CMAKE_STATIC_LINKER_FLAGS_RELEASE_INIT " /nologo ") # VS adds /LTCG + + if(CMAKE_GENERATOR MATCHES "Ninja") + set(additional_exe_flags "/WINMD") # VS Generator chokes on this in the compiler detection + endif() string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") # VS adds /DEBUG:FULL /TLBID:1. WindowsApp.lib is in CMAKE_C|CXX_STANDARD_LIBRARIES - string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD /APPCONTAINER /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") - # VS adds /DEBUG:FULL /TLBID:1. + string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG ${additional_exe_flags} /APPCONTAINER /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") # VS uses /LTCG:incremental set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") - string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT " /nologo ") string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " /nologo ") string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ") From 26a25005545bfe86bdfef8549c7bf80aab004cff Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 1 Apr 2022 15:23:20 +0200 Subject: [PATCH 15/59] add /DNDEBUG --- scripts/toolchains/uwp.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/toolchains/uwp.cmake b/scripts/toolchains/uwp.cmake index b5616fe21fadbe..49511dcd8b6a5c 100644 --- a/scripts/toolchains/uwp.cmake +++ b/scripts/toolchains/uwp.cmake @@ -40,8 +40,8 @@ if(NOT _CMAKE_IN_TRY_COMPILE) set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /RTC1 ${VCPKG_CRT_LINK_FLAG_PREFIX}d ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /Od /RTC1 ${VCPKG_CRT_LINK_FLAG_PREFIX}d ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") - set(CMAKE_CXX_FLAGS_RELEASE "/Gy /O2 /Oi ${VCPKG_CRT_LINK_FLAG_PREFIX} ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") # VS adds /GL - set(CMAKE_C_FLAGS_RELEASE "/Gy /O2 /Oi ${VCPKG_CRT_LINK_FLAG_PREFIX} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") + set(CMAKE_CXX_FLAGS_RELEASE "/Gy /O2 /Oi /DNDEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX} ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") # VS adds /GL + set(CMAKE_C_FLAGS_RELEASE "/Gy /O2 /Oi /DNDEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") string(APPEND CMAKE_STATIC_LINKER_FLAGS_RELEASE_INIT " /nologo ") # VS adds /LTCG From f63f516736d426d05a1191fed5354dd3d11d7ee6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 1 Apr 2022 15:27:25 +0200 Subject: [PATCH 16/59] setup versioning stuff --- ports/boost-modular-build-helper/CMakeLists.txt | 3 --- ports/boost-modular-build-helper/vcpkg.json | 2 +- ports/vcpkg-cmake/vcpkg.json | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index 6c95850b8779f9..c395a4dfc2731b 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -96,10 +96,7 @@ if(VCPKG_DETECTED_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") list(TRANSFORM libpath_args PREPEND "/AI\"") list(TRANSFORM libpath_args APPEND "\"") list(JOIN libpath_args " " libpath_arg) - - #string(APPEND CXXFLAGS " /ZW") string(APPEND COMPILEFLAGS " ${libpath_arg} /D_WIN32_WINNT=0x0A00") - #string(APPEND CFLAGS " -Zl") list(APPEND B2_OPTIONS windows-api=store) list(APPEND B2_OPTIONS linkflags=WindowsApp.lib) endif() diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index a70e222808d242..63a24f90009b3d 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version": "1.78.0", - "port-version": 3, + "port-version": 4, "description": "Internal vcpkg port used to build Boost libraries", "license": "MIT", "dependencies": [ diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 7cf193990473d9..1c094e050c7faf 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,5 @@ { "name": "vcpkg-cmake", - "version-date": "2022-02-14", + "version-date": "2022-04-01", "license": "MIT" } From 7619df2a69bd071cb5f744a8b3edd0190c38d450 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 1 Apr 2022 15:28:38 +0200 Subject: [PATCH 17/59] version stuff --- ports/cpprestsdk/vcpkg.json | 1 + ports/liblbfgs/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/cpprestsdk/vcpkg.json b/ports/cpprestsdk/vcpkg.json index 58d020e824c86e..3a4610ef7a2c3e 100644 --- a/ports/cpprestsdk/vcpkg.json +++ b/ports/cpprestsdk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cpprestsdk", "version": "2.10.18", + "port-version": 1, "description": [ "C++11 JSON, REST, and OAuth library", "The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services." diff --git a/ports/liblbfgs/vcpkg.json b/ports/liblbfgs/vcpkg.json index 08276d758abb55..8525cd58842582 100644 --- a/ports/liblbfgs/vcpkg.json +++ b/ports/liblbfgs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "liblbfgs", - "version-string": "1.10", + "version": "1.10", "port-version": 2, "description": "libLBFGS: a library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)", "homepage": "http://www.chokkan.org/software/liblbfgs/", From c79dea1a240e7afd569cddaead113e4ba079edf6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 1 Apr 2022 15:29:00 +0200 Subject: [PATCH 18/59] version stuff --- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 12 ++++++------ versions/c-/cpprestsdk.json | 5 +++++ versions/l-/libcerf.json | 5 +++++ versions/l-/liblbfgs.json | 5 +++++ versions/s-/sdl2.json | 5 +++++ versions/v-/vcpkg-cmake.json | 5 +++++ 7 files changed, 36 insertions(+), 6 deletions(-) diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 7abc1eca933f86..0cff67080c4fd4 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69ce7812549b5ae7c033f8c61aa8d3e986a35bea", + "version": "1.78.0", + "port-version": 4 + }, { "git-tree": "ee3c3c2a3ecfb2bcff50d0758da7d6c36479a3c4", "version": "1.78.0", diff --git a/versions/baseline.json b/versions/baseline.json index 00c6d0f6c94ec4..d30050712eb721 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -822,7 +822,7 @@ }, "boost-modular-build-helper": { "baseline": "1.78.0", - "port-version": 3 + "port-version": 4 }, "boost-move": { "baseline": "1.78.0", @@ -1610,7 +1610,7 @@ }, "cpprestsdk": { "baseline": "2.10.18", - "port-version": 0 + "port-version": 1 }, "cpptoml": { "baseline": "v0.1.1", @@ -3418,7 +3418,7 @@ }, "libcerf": { "baseline": "1.13", - "port-version": 2 + "port-version": 3 }, "libconfig": { "baseline": "1.7.3", @@ -3682,7 +3682,7 @@ }, "liblbfgs": { "baseline": "1.10", - "port-version": 1 + "port-version": 2 }, "liblemon": { "baseline": "2019-06-13", @@ -6338,7 +6338,7 @@ }, "sdl2": { "baseline": "2.0.20", - "port-version": 1 + "port-version": 2 }, "sdl2-gfx": { "baseline": "1.0.4", @@ -7261,7 +7261,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-02-14", + "baseline": "2022-04-01", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/c-/cpprestsdk.json b/versions/c-/cpprestsdk.json index 5372196d40b07d..4855a3314a3878 100644 --- a/versions/c-/cpprestsdk.json +++ b/versions/c-/cpprestsdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b37c56224faff461184f427b95f10dc320d74d50", + "version": "2.10.18", + "port-version": 1 + }, { "git-tree": "a4c5e50b9a83b6f9142256d1142b371da93db065", "version-string": "2.10.18", diff --git a/versions/l-/libcerf.json b/versions/l-/libcerf.json index 7a35564988a5ec..471bb29f3df990 100644 --- a/versions/l-/libcerf.json +++ b/versions/l-/libcerf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1aed61567fd3da5dc36a9a5290262b389ab79fa5", + "version": "1.13", + "port-version": 3 + }, { "git-tree": "e4bb4a4b841e96215ccc856fa1b8acc56270a1e4", "version-string": "1.13", diff --git a/versions/l-/liblbfgs.json b/versions/l-/liblbfgs.json index e3c7174bb55b40..d562fe8f06f8ea 100644 --- a/versions/l-/liblbfgs.json +++ b/versions/l-/liblbfgs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdf2ac29eb7e040dc4eefe6d623d5caa3b592de0", + "version": "1.10", + "port-version": 2 + }, { "git-tree": "f9251e490103e48e6ba9a01c6c61468381f0c8f1", "version-string": "1.10", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index 16b746b1f06cf3..94a842b649d085 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aef919de1c176904dc27f81834ee293664557f02", + "version": "2.0.20", + "port-version": 2 + }, { "git-tree": "9900463f2847ed86e25bac1688c527ae3486a024", "version": "2.0.20", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 56a6f595e74967..7417e5b30ace62 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "78144b4321e7916137fe74462f455806a129d19b", + "version-date": "2022-04-01", + "port-version": 0 + }, { "git-tree": "bdfdf28cf28bc07d02af864315ca291dcfae180b", "version-date": "2022-02-14", From ef54a0bb9e871f9eb72ff89b1f5b589115d18012 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 1 Apr 2022 23:49:21 +0200 Subject: [PATCH 19/59] fix physfs --- ports/physfs/portfile.cmake | 9 +++++++-- ports/physfs/vcpkg.json | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/physfs/portfile.cmake b/ports/physfs/portfile.cmake index 879a2b0e0f14a7..b47465de2924d0 100644 --- a/ports/physfs/portfile.cmake +++ b/ports/physfs/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" REF ${PHYSFS_VERSION} PATCHES "001-fix-lzmasdk-arm64-windows.patch" @@ -20,8 +20,13 @@ vcpkg_extract_source_archive_ex( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PHYSFS_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PHYSFS_SHARED) +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" + ${configure_opts} OPTIONS -DPHYSFS_BUILD_STATIC=${PHYSFS_STATIC} -DPHYSFS_BUILD_SHARED=${PHYSFS_SHARED} diff --git a/ports/physfs/vcpkg.json b/ports/physfs/vcpkg.json index b740565cafc632..649fa9384935ad 100644 --- a/ports/physfs/vcpkg.json +++ b/ports/physfs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "physfs", "version-semver": "3.0.2", - "port-version": 6, + "port-version": 7, "description": "a library to provide abstract access to various archives", "homepage": "https://icculus.org/physfs/", "dependencies": [ From 3aef0da7a61e19d01c33073e4d5873636f1f1828 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 1 Apr 2022 23:49:29 +0200 Subject: [PATCH 20/59] bump physx --- ports/physx/vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/physx/vcpkg.json b/ports/physx/vcpkg.json index aec7787acad4ab..89fb477bf594ad 100644 --- a/ports/physx/vcpkg.json +++ b/ports/physx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "physx", - "version-semver": "4.1.2", - "port-version": 2, + "version": "4.1.2", + "port-version": 3, "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs", "homepage": "https://github.com/NVIDIAGameWorks/PhysX", "supports": "!mingw", From b73af0c71a506003b512650d30f05775b8c8c5c1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 1 Apr 2022 23:54:41 +0200 Subject: [PATCH 21/59] fix orc --- ports/orc/portfile.cmake | 28 ++++++++++++++-------------- ports/orc/vcpkg.json | 7 +++++-- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake index 722b6a10a5f0b5..b130ed58260980 100644 --- a/ports/orc/portfile.cmake +++ b/ports/orc/portfile.cmake @@ -16,11 +16,7 @@ file(REMOVE "${SOURCE_PATH}/cmake_modules/FindProtobuf.cmake") file(REMOVE "${SOURCE_PATH}/cmake_modules/FindSnappy.cmake") file(REMOVE "${SOURCE_PATH}/cmake_modules/FindZLIB.cmake") -if(CMAKE_HOST_WIN32) - set(PROTOBUF_EXECUTABLE ${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc.exe) -else() - set(PROTOBUF_EXECUTABLE ${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc) -endif() +set(PROTOBUF_EXECUTABLE "${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}") if(VCPKG_TARGET_IS_WINDOWS) set(BUILD_TOOLS OFF) @@ -28,9 +24,13 @@ else() set(BUILD_TOOLS ON) endif() +if(NOT VCPKG_TARGET_IS_UWP) + set(configure_opts PREFER_NINJA) +endif() + vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" + ${configure_opts} OPTIONS -DBUILD_TOOLS=${BUILD_TOOLS} -DBUILD_CPP_TESTS=OFF @@ -47,18 +47,18 @@ vcpkg_copy_pdbs() file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/orc-*) if(TOOLS) - file(COPY ${TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/orc) + file(COPY ${TOOLS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/orc") file(REMOVE ${TOOLS}) endif() -file(GLOB BINS ${CURRENT_PACKAGES_DIR}/bin/*) +file(GLOB BINS "${CURRENT_PACKAGES_DIR}/bin/*") if(NOT BINS) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/orc/vcpkg.json b/ports/orc/vcpkg.json index 7f87b3c6236d10..25455eb2d336ef 100644 --- a/ports/orc/vcpkg.json +++ b/ports/orc/vcpkg.json @@ -1,13 +1,16 @@ { "name": "orc", "version-string": "1.6.4", - "port-version": 2, + "port-version": 3, "description": "The smallest, fastest columnar storage for Hadoop workloads.", "homepage": "https://orc.apache.org/", "dependencies": [ "gtest", "lz4", - "protobuf", + { + "name": "protobuf", + "host": true + }, "snappy", "zlib", "zstd" From 813b310667d82d8dbc053597f85fa3d27b26c78d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 2 Apr 2022 00:34:26 +0200 Subject: [PATCH 22/59] fix ffmpeg ? --- ports/ffmpeg/portfile.cmake | 6 +++--- ports/ffmpeg/vcpkg.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 1d32c992ed24d7..e602aea6834561 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -112,9 +112,9 @@ if(VCPKG_DETECTED_MSVC) set(OPTIONS "--toolchain=msvc ${OPTIONS}") # This is required because ffmpeg depends upon optimizations to link correctly string(APPEND VCPKG_COMBINED_C_FLAGS_DEBUG " -O2") - string(REPLACE " -RTC1 " "" VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") - string(REPLACE " -Od " "" VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") - string(REPLACE " -Ob0 " "" VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + string(REPLACE " -RTC1" "" VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + string(REPLACE " -Od" "" VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + string(REPLACE " -Ob0" "" VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") endif() string(APPEND VCPKG_COMBINED_C_FLAGS_DEBUG " -I \"${CURRENT_INSTALLED_DIR}/include\"") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index d29f83270fd81b..be2c4993a759a0 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4.1", - "port-version": 11, + "port-version": 12, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." From bbd9f1733c62813349675a3f058c4d5918261421 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 2 Apr 2022 10:20:00 +0200 Subject: [PATCH 23/59] loadlibrary is not available in uwp --- ports/igraph/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json index 8b9c46bbf5038b..6fc76882ae7d91 100644 --- a/ports/igraph/vcpkg.json +++ b/ports/igraph/vcpkg.json @@ -3,6 +3,7 @@ "version": "0.9.7", "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.", "homepage": "https://igraph.org/", + "supports": "!uwp", "dependencies": [ "suitesparse", { From 14e61aef4fa4afba17c8d6cfbccf4cdf5cf62188 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 2 Apr 2022 10:55:07 +0200 Subject: [PATCH 24/59] fix issues --- ports/orc/vcpkg.json | 1 + scripts/ci.baseline.txt | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/ports/orc/vcpkg.json b/ports/orc/vcpkg.json index 25455eb2d336ef..550987e8604e99 100644 --- a/ports/orc/vcpkg.json +++ b/ports/orc/vcpkg.json @@ -7,6 +7,7 @@ "dependencies": [ "gtest", "lz4", + "protobuf", { "name": "protobuf", "host": true diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 474f7d2a06b42a..2a120a02ace57b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -216,6 +216,8 @@ discord-game-sdk:x64-windows-static=fail discord-game-sdk:x64-windows-static-md=fail discord-rpc:arm-uwp=fail discord-rpc:x64-uwp=fail +dlib:arm-uwp=fail +dlib:x64-uwp=fail dmlc:arm-uwp=fail dmlc:x64-uwp=fail dpdk:arm-uwp=fail @@ -735,6 +737,8 @@ mmx:x64-uwp=skip mmx:arm64-windows=skip # Flaky strange linker error mongo-c-driver:x64-osx=skip +mongo-c-driver:arm-uwp=fail +mongo-c-driver:x64-uwp=fail mongoose:arm-uwp=fail mongoose:x64-uwp=fail monkeys-audio:arm64-windows=fail From 6c599aee2f890b6d78f5ca1dee76900c70deca71 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 2 Apr 2022 20:34:40 +0200 Subject: [PATCH 25/59] fix version stuff --- ports/igraph/vcpkg.json | 1 + ports/orc/vcpkg.json | 2 +- versions/b-/blas.json | 5 ----- versions/b-/boost-modular-build-helper.json | 5 ----- versions/baseline.json | 16 ++++++++-------- versions/c-/cpprestsdk.json | 5 ----- versions/l-/libcerf.json | 5 ----- versions/l-/liblbfgs.json | 5 ----- versions/s-/sdl2.json | 5 ----- versions/v-/vcpkg-cmake.json | 5 ----- 10 files changed, 10 insertions(+), 44 deletions(-) diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json index 6fc76882ae7d91..f427819eb89fc8 100644 --- a/ports/igraph/vcpkg.json +++ b/ports/igraph/vcpkg.json @@ -1,6 +1,7 @@ { "name": "igraph", "version": "0.9.7", + "port-version": "1", "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.", "homepage": "https://igraph.org/", "supports": "!uwp", diff --git a/ports/orc/vcpkg.json b/ports/orc/vcpkg.json index 550987e8604e99..764fe5741b3699 100644 --- a/ports/orc/vcpkg.json +++ b/ports/orc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "orc", - "version-string": "1.6.4", + "version": "1.6.4", "port-version": 3, "description": "The smallest, fastest columnar storage for Hadoop workloads.", "homepage": "https://orc.apache.org/", diff --git a/versions/b-/blas.json b/versions/b-/blas.json index 4b5504b0d48d00..c8b3ade64a24bc 100644 --- a/versions/b-/blas.json +++ b/versions/b-/blas.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "c7aa1a398b27db16f88c13e161e4d758ce55fd56", - "version-date": "2022-03-31", - "port-version": 0 - }, { "git-tree": "0d105be9337f4a6f294a7eced2da18e8cdb99051", "version-string": "1", diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 0cff67080c4fd4..7abc1eca933f86 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "69ce7812549b5ae7c033f8c61aa8d3e986a35bea", - "version": "1.78.0", - "port-version": 4 - }, { "git-tree": "ee3c3c2a3ecfb2bcff50d0758da7d6c36479a3c4", "version": "1.78.0", diff --git a/versions/baseline.json b/versions/baseline.json index f02ab728e5c436..9b5c1056e7a70b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -485,8 +485,8 @@ "port-version": 0 }, "blas": { - "baseline": "2022-03-31", - "port-version": 0 + "baseline": "1", + "port-version": 1 }, "blaze": { "baseline": "3.8", @@ -822,7 +822,7 @@ }, "boost-modular-build-helper": { "baseline": "1.78.0", - "port-version": 4 + "port-version": 3 }, "boost-move": { "baseline": "1.78.0", @@ -1610,7 +1610,7 @@ }, "cpprestsdk": { "baseline": "2.10.18", - "port-version": 1 + "port-version": 0 }, "cpptoml": { "baseline": "v0.1.1", @@ -3418,7 +3418,7 @@ }, "libcerf": { "baseline": "1.13", - "port-version": 3 + "port-version": 2 }, "libconfig": { "baseline": "1.7.3", @@ -3682,7 +3682,7 @@ }, "liblbfgs": { "baseline": "1.10", - "port-version": 2 + "port-version": 1 }, "liblemon": { "baseline": "2019-06-13", @@ -6338,7 +6338,7 @@ }, "sdl2": { "baseline": "2.0.20", - "port-version": 2 + "port-version": 1 }, "sdl2-gfx": { "baseline": "1.0.4", @@ -7261,7 +7261,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-04-01", + "baseline": "2022-02-14", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/c-/cpprestsdk.json b/versions/c-/cpprestsdk.json index 4855a3314a3878..5372196d40b07d 100644 --- a/versions/c-/cpprestsdk.json +++ b/versions/c-/cpprestsdk.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "b37c56224faff461184f427b95f10dc320d74d50", - "version": "2.10.18", - "port-version": 1 - }, { "git-tree": "a4c5e50b9a83b6f9142256d1142b371da93db065", "version-string": "2.10.18", diff --git a/versions/l-/libcerf.json b/versions/l-/libcerf.json index 471bb29f3df990..7a35564988a5ec 100644 --- a/versions/l-/libcerf.json +++ b/versions/l-/libcerf.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "1aed61567fd3da5dc36a9a5290262b389ab79fa5", - "version": "1.13", - "port-version": 3 - }, { "git-tree": "e4bb4a4b841e96215ccc856fa1b8acc56270a1e4", "version-string": "1.13", diff --git a/versions/l-/liblbfgs.json b/versions/l-/liblbfgs.json index d562fe8f06f8ea..e3c7174bb55b40 100644 --- a/versions/l-/liblbfgs.json +++ b/versions/l-/liblbfgs.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "cdf2ac29eb7e040dc4eefe6d623d5caa3b592de0", - "version": "1.10", - "port-version": 2 - }, { "git-tree": "f9251e490103e48e6ba9a01c6c61468381f0c8f1", "version-string": "1.10", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index 94a842b649d085..16b746b1f06cf3 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "aef919de1c176904dc27f81834ee293664557f02", - "version": "2.0.20", - "port-version": 2 - }, { "git-tree": "9900463f2847ed86e25bac1688c527ae3486a024", "version": "2.0.20", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 7417e5b30ace62..56a6f595e74967 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "78144b4321e7916137fe74462f455806a129d19b", - "version-date": "2022-04-01", - "port-version": 0 - }, { "git-tree": "bdfdf28cf28bc07d02af864315ca291dcfae180b", "version-date": "2022-02-14", From 89e140c50c48696f2d55491bc9c3551ac2e48073 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 2 Apr 2022 20:35:10 +0200 Subject: [PATCH 26/59] version stuff --- versions/b-/blas.json | 5 +++++ versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 24 ++++++++++----------- versions/c-/cpprestsdk.json | 5 +++++ versions/f-/ffmpeg.json | 5 +++++ versions/l-/libcerf.json | 5 +++++ versions/l-/liblbfgs.json | 5 +++++ versions/o-/orc.json | 5 +++++ versions/p-/physfs.json | 5 +++++ versions/p-/physx.json | 5 +++++ versions/s-/sdl2.json | 5 +++++ versions/v-/vcpkg-cmake.json | 5 +++++ 12 files changed, 67 insertions(+), 12 deletions(-) diff --git a/versions/b-/blas.json b/versions/b-/blas.json index c8b3ade64a24bc..4b5504b0d48d00 100644 --- a/versions/b-/blas.json +++ b/versions/b-/blas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7aa1a398b27db16f88c13e161e4d758ce55fd56", + "version-date": "2022-03-31", + "port-version": 0 + }, { "git-tree": "0d105be9337f4a6f294a7eced2da18e8cdb99051", "version-string": "1", diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 7abc1eca933f86..0cff67080c4fd4 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69ce7812549b5ae7c033f8c61aa8d3e986a35bea", + "version": "1.78.0", + "port-version": 4 + }, { "git-tree": "ee3c3c2a3ecfb2bcff50d0758da7d6c36479a3c4", "version": "1.78.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9b5c1056e7a70b..08e0c781e550c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -485,8 +485,8 @@ "port-version": 0 }, "blas": { - "baseline": "1", - "port-version": 1 + "baseline": "2022-03-31", + "port-version": 0 }, "blaze": { "baseline": "3.8", @@ -822,7 +822,7 @@ }, "boost-modular-build-helper": { "baseline": "1.78.0", - "port-version": 3 + "port-version": 4 }, "boost-move": { "baseline": "1.78.0", @@ -1610,7 +1610,7 @@ }, "cpprestsdk": { "baseline": "2.10.18", - "port-version": 0 + "port-version": 1 }, "cpptoml": { "baseline": "v0.1.1", @@ -2178,7 +2178,7 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 11 + "port-version": 12 }, "ffnvcodec": { "baseline": "11.1.5.0", @@ -3418,7 +3418,7 @@ }, "libcerf": { "baseline": "1.13", - "port-version": 2 + "port-version": 3 }, "libconfig": { "baseline": "1.7.3", @@ -3682,7 +3682,7 @@ }, "liblbfgs": { "baseline": "1.10", - "port-version": 1 + "port-version": 2 }, "liblemon": { "baseline": "2019-06-13", @@ -5194,7 +5194,7 @@ }, "orc": { "baseline": "1.6.4", - "port-version": 2 + "port-version": 3 }, "orocos-kdl": { "baseline": "1.4", @@ -5354,11 +5354,11 @@ }, "physfs": { "baseline": "3.0.2", - "port-version": 6 + "port-version": 7 }, "physx": { "baseline": "4.1.2", - "port-version": 1 + "port-version": 3 }, "picojson": { "baseline": "1.3.0", @@ -6338,7 +6338,7 @@ }, "sdl2": { "baseline": "2.0.20", - "port-version": 1 + "port-version": 2 }, "sdl2-gfx": { "baseline": "1.0.4", @@ -7261,7 +7261,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-02-14", + "baseline": "2022-04-01", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/c-/cpprestsdk.json b/versions/c-/cpprestsdk.json index 5372196d40b07d..4855a3314a3878 100644 --- a/versions/c-/cpprestsdk.json +++ b/versions/c-/cpprestsdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b37c56224faff461184f427b95f10dc320d74d50", + "version": "2.10.18", + "port-version": 1 + }, { "git-tree": "a4c5e50b9a83b6f9142256d1142b371da93db065", "version-string": "2.10.18", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 8698734d413796..e14a0e84b6531c 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "95e3e17d5d08ec32b622d8478786306577cd87c3", + "version": "4.4.1", + "port-version": 12 + }, { "git-tree": "4be11b342853200f575143c5bb5353b044621293", "version": "4.4.1", diff --git a/versions/l-/libcerf.json b/versions/l-/libcerf.json index 7a35564988a5ec..471bb29f3df990 100644 --- a/versions/l-/libcerf.json +++ b/versions/l-/libcerf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1aed61567fd3da5dc36a9a5290262b389ab79fa5", + "version": "1.13", + "port-version": 3 + }, { "git-tree": "e4bb4a4b841e96215ccc856fa1b8acc56270a1e4", "version-string": "1.13", diff --git a/versions/l-/liblbfgs.json b/versions/l-/liblbfgs.json index e3c7174bb55b40..d562fe8f06f8ea 100644 --- a/versions/l-/liblbfgs.json +++ b/versions/l-/liblbfgs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdf2ac29eb7e040dc4eefe6d623d5caa3b592de0", + "version": "1.10", + "port-version": 2 + }, { "git-tree": "f9251e490103e48e6ba9a01c6c61468381f0c8f1", "version-string": "1.10", diff --git a/versions/o-/orc.json b/versions/o-/orc.json index 23e58df0a4be31..d3fb762053f48b 100644 --- a/versions/o-/orc.json +++ b/versions/o-/orc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae0b7e4ce97e2282040d4b26a787cb380b8dc814", + "version": "1.6.4", + "port-version": 3 + }, { "git-tree": "8cd78baa4d8b7df9077f76b8f5d600aac6e09716", "version-string": "1.6.4", diff --git a/versions/p-/physfs.json b/versions/p-/physfs.json index 7e719741c5465f..7961b91513989b 100644 --- a/versions/p-/physfs.json +++ b/versions/p-/physfs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0acbb8771db07ce3e4641f015189fb48e732bdd5", + "version-semver": "3.0.2", + "port-version": 7 + }, { "git-tree": "17d9ad3560e379cc51921a51982f4d31d106f1ed", "version-semver": "3.0.2", diff --git a/versions/p-/physx.json b/versions/p-/physx.json index 5cbbdf356642f6..30e3ad42e087ee 100644 --- a/versions/p-/physx.json +++ b/versions/p-/physx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee345a4179e146e82c4479c1d435412049a861d0", + "version": "4.1.2", + "port-version": 3 + }, { "git-tree": "3efd7a1c7727eec4a15ba3ac6f8f013550750760", "version-semver": "4.1.2", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index 16b746b1f06cf3..94a842b649d085 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aef919de1c176904dc27f81834ee293664557f02", + "version": "2.0.20", + "port-version": 2 + }, { "git-tree": "9900463f2847ed86e25bac1688c527ae3486a024", "version": "2.0.20", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 56a6f595e74967..7417e5b30ace62 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "78144b4321e7916137fe74462f455806a129d19b", + "version-date": "2022-04-01", + "port-version": 0 + }, { "git-tree": "bdfdf28cf28bc07d02af864315ca291dcfae180b", "version-date": "2022-02-14", From e60be2fd30cb5fdf89125c932174a5f4c990e9c1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 4 Apr 2022 11:44:20 +0200 Subject: [PATCH 27/59] CI retrigger From 0915931b04b4b6b5a07176ced9fe727f587115cc Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 7 Apr 2022 16:52:57 +0200 Subject: [PATCH 28/59] 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 63f37ea59c9561..264577c0cd4ebf 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-08", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index a5fd961e588c33..80f8216ace9f5a 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43ef06ed2eee9de7e9db4595638bcf562c2c333b", + "version-date": "2022-04-08", + "port-version": 0 + }, { "git-tree": "34d8604d164edd2903bdb833adf30fe1516c9982", "version-date": "2022-04-05", From 1fb644a29473e5d7b9a10b330d17ca76381597c3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 8 Apr 2022 15:31:59 +0200 Subject: [PATCH 29/59] version stuff --- versions/baseline.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 526ffde25e4273..5703f1cd24e180 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -489,8 +489,8 @@ "port-version": 0 }, "blas": { - "baseline": "1", - "port-version": 1 + "baseline": "2022-03-31", + "port-version": 0 }, "blaze": { "baseline": "3.8", @@ -826,7 +826,7 @@ }, "boost-modular-build-helper": { "baseline": "1.78.0", - "port-version": 3 + "port-version": 4 }, "boost-move": { "baseline": "1.78.0", @@ -1614,7 +1614,7 @@ }, "cpprestsdk": { "baseline": "2.10.18", - "port-version": 0 + "port-version": 1 }, "cpptoml": { "baseline": "v0.1.1", @@ -2186,7 +2186,7 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 11 + "port-version": 12 }, "ffnvcodec": { "baseline": "11.1.5.0", @@ -3430,7 +3430,7 @@ }, "libcerf": { "baseline": "1.13", - "port-version": 2 + "port-version": 3 }, "libconfig": { "baseline": "1.7.3", @@ -3694,7 +3694,7 @@ }, "liblbfgs": { "baseline": "1.10", - "port-version": 1 + "port-version": 2 }, "liblemon": { "baseline": "2019-06-13", @@ -5210,7 +5210,7 @@ }, "orc": { "baseline": "1.6.4", - "port-version": 2 + "port-version": 3 }, "orocos-kdl": { "baseline": "1.4", @@ -5370,11 +5370,11 @@ }, "physfs": { "baseline": "3.0.2", - "port-version": 6 + "port-version": 7 }, "physx": { "baseline": "4.1.2", - "port-version": 1 + "port-version": 3 }, "picojson": { "baseline": "1.3.0", @@ -6358,7 +6358,7 @@ }, "sdl2": { "baseline": "2.0.20", - "port-version": 1 + "port-version": 2 }, "sdl2-gfx": { "baseline": "1.0.4", From c47b8b31f89c4f4a72897eb8f9ef31a98152d4ea Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 8 Apr 2022 18:18:03 +0200 Subject: [PATCH 30/59] Use vcpkg_cmake_configure --- ports/orc/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake index b130ed58260980..a535864a9fd425 100644 --- a/ports/orc/portfile.cmake +++ b/ports/orc/portfile.cmake @@ -28,7 +28,7 @@ if(NOT VCPKG_TARGET_IS_UWP) set(configure_opts PREFER_NINJA) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ${configure_opts} OPTIONS From 7aa40af95134d3704e223bc3efd3b566b164540b Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 8 Apr 2022 18:28:50 +0200 Subject: [PATCH 31/59] [orc] use vcpkg_cmake_config --- ports/orc/portfile.cmake | 2 +- ports/orc/vcpkg.json | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake index 722b6a10a5f0b5..14a53bf1d8ca88 100644 --- a/ports/orc/portfile.cmake +++ b/ports/orc/portfile.cmake @@ -28,7 +28,7 @@ else() set(BUILD_TOOLS ON) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS diff --git a/ports/orc/vcpkg.json b/ports/orc/vcpkg.json index 7f87b3c6236d10..f3fcb5456eb703 100644 --- a/ports/orc/vcpkg.json +++ b/ports/orc/vcpkg.json @@ -9,6 +9,10 @@ "lz4", "protobuf", "snappy", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib", "zstd" ] From 688eae54f71076af73632e492657a78c2e9e5600 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 8 Apr 2022 18:29:17 +0200 Subject: [PATCH 32/59] [physx] Fix version --- ports/physx/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/physx/vcpkg.json b/ports/physx/vcpkg.json index fd3665a648d09c..aec7787acad4ab 100644 --- a/ports/physx/vcpkg.json +++ b/ports/physx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "physx", "version-semver": "4.1.2", - "port-version": 1, + "port-version": 2, "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs", "homepage": "https://github.com/NVIDIAGameWorks/PhysX", "supports": "!mingw", From c01600a5f51bf97657b80aac91b7081b0ffa5bad Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 8 Apr 2022 18:30:03 +0200 Subject: [PATCH 33/59] [orc] update port-version --- ports/orc/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/orc/vcpkg.json b/ports/orc/vcpkg.json index f3fcb5456eb703..1ca0ebd9be99e9 100644 --- a/ports/orc/vcpkg.json +++ b/ports/orc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "orc", "version-string": "1.6.4", - "port-version": 2, + "port-version": 3, "description": "The smallest, fastest columnar storage for Hadoop workloads.", "homepage": "https://orc.apache.org/", "dependencies": [ From 7b6fa6c68d3ae3949875695c405507c8a49ddc07 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 8 Apr 2022 18:31:24 +0200 Subject: [PATCH 34/59] version --- versions/baseline.json | 4 ++-- versions/o-/orc.json | 5 +++++ versions/p-/physx.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 4dc8f8d36ca744..497ab7d30e9a02 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5210,7 +5210,7 @@ }, "orc": { "baseline": "1.6.4", - "port-version": 2 + "port-version": 3 }, "orocos-kdl": { "baseline": "1.4", @@ -5374,7 +5374,7 @@ }, "physx": { "baseline": "4.1.2", - "port-version": 1 + "port-version": 2 }, "picojson": { "baseline": "1.3.0", diff --git a/versions/o-/orc.json b/versions/o-/orc.json index 23e58df0a4be31..ba4a5b44f7d34f 100644 --- a/versions/o-/orc.json +++ b/versions/o-/orc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f19424d02263d4597401f8e22fa46ce0147ff948", + "version-string": "1.6.4", + "port-version": 3 + }, { "git-tree": "8cd78baa4d8b7df9077f76b8f5d600aac6e09716", "version-string": "1.6.4", diff --git a/versions/p-/physx.json b/versions/p-/physx.json index 5cbbdf356642f6..3ff5affefc8520 100644 --- a/versions/p-/physx.json +++ b/versions/p-/physx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdf60cbb56f14439ade20d95507446f483a9fa45", + "version-semver": "4.1.2", + "port-version": 2 + }, { "git-tree": "3efd7a1c7727eec4a15ba3ac6f8f013550750760", "version-semver": "4.1.2", From 252758608ca91a03709a70f3b0b6a602589517c6 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 8 Apr 2022 18:38:40 +0200 Subject: [PATCH 35/59] Physx cmake (#8) * [orc] use vcpkg_cmake_config * [physx] Fix version * [orc] update port-version * version --- ports/orc/vcpkg.json | 4 ++++ ports/physx/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/o-/orc.json | 2 +- versions/p-/physx.json | 6 +++--- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/orc/vcpkg.json b/ports/orc/vcpkg.json index 764fe5741b3699..d442716c41223f 100644 --- a/ports/orc/vcpkg.json +++ b/ports/orc/vcpkg.json @@ -13,6 +13,10 @@ "host": true }, "snappy", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib", "zstd" ] diff --git a/ports/physx/vcpkg.json b/ports/physx/vcpkg.json index 89fb477bf594ad..aec7787acad4ab 100644 --- a/ports/physx/vcpkg.json +++ b/ports/physx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "physx", - "version": "4.1.2", - "port-version": 3, + "version-semver": "4.1.2", + "port-version": 2, "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs", "homepage": "https://github.com/NVIDIAGameWorks/PhysX", "supports": "!mingw", diff --git a/versions/baseline.json b/versions/baseline.json index 5703f1cd24e180..8de80bae1e04e6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5374,7 +5374,7 @@ }, "physx": { "baseline": "4.1.2", - "port-version": 3 + "port-version": 2 }, "picojson": { "baseline": "1.3.0", diff --git a/versions/o-/orc.json b/versions/o-/orc.json index d3fb762053f48b..9e0ad91e6da3b6 100644 --- a/versions/o-/orc.json +++ b/versions/o-/orc.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ae0b7e4ce97e2282040d4b26a787cb380b8dc814", + "git-tree": "f19424d02263d4597401f8e22fa46ce0147ff948", "version": "1.6.4", "port-version": 3 }, diff --git a/versions/p-/physx.json b/versions/p-/physx.json index 30e3ad42e087ee..3ff5affefc8520 100644 --- a/versions/p-/physx.json +++ b/versions/p-/physx.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "ee345a4179e146e82c4479c1d435412049a861d0", - "version": "4.1.2", - "port-version": 3 + "git-tree": "cdf60cbb56f14439ade20d95507446f483a9fa45", + "version-semver": "4.1.2", + "port-version": 2 }, { "git-tree": "3efd7a1c7727eec4a15ba3ac6f8f013550750760", From 63f33358833fe8d9ed6e8d5b18d21bc41c195636 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 8 Apr 2022 21:58:03 +0200 Subject: [PATCH 36/59] update version db --- versions/o-/orc.json | 2 +- versions/p-/physx.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/o-/orc.json b/versions/o-/orc.json index 9e0ad91e6da3b6..ffe366ae1f5f0f 100644 --- a/versions/o-/orc.json +++ b/versions/o-/orc.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f19424d02263d4597401f8e22fa46ce0147ff948", + "git-tree": "12874a520d4388695b7ede2b6d19a00f021ee63c", "version": "1.6.4", "port-version": 3 }, diff --git a/versions/p-/physx.json b/versions/p-/physx.json index 3ff5affefc8520..3f3e4038b3f5ed 100644 --- a/versions/p-/physx.json +++ b/versions/p-/physx.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "cdf60cbb56f14439ade20d95507446f483a9fa45", + "git-tree": "ee3da7ecd28593c028b68392f43f3d42d0770deb", "version-semver": "4.1.2", "port-version": 2 }, From 7653f89c9c58bc98ab647fb056c23a01495042a1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 8 Apr 2022 22:01:43 +0200 Subject: [PATCH 37/59] fix port version --- ports/igraph/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json index f427819eb89fc8..1bc7904c77e704 100644 --- a/ports/igraph/vcpkg.json +++ b/ports/igraph/vcpkg.json @@ -1,7 +1,7 @@ { "name": "igraph", "version": "0.9.7", - "port-version": "1", + "port-version": 1, "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.", "homepage": "https://igraph.org/", "supports": "!uwp", From 276ad89941084cf35cee822aa59f254c54c13b81 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 8 Apr 2022 22:02:10 +0200 Subject: [PATCH 38/59] version db stuff --- versions/baseline.json | 2 +- versions/i-/igraph.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 8de80bae1e04e6..7701af38f0441d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2882,7 +2882,7 @@ }, "igraph": { "baseline": "0.9.7", - "port-version": 0 + "port-version": 1 }, "iir1": { "baseline": "1.9.0", diff --git a/versions/i-/igraph.json b/versions/i-/igraph.json index c133b0da6c54de..7642333176eedb 100644 --- a/versions/i-/igraph.json +++ b/versions/i-/igraph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "663f130ff7fd2e6f59ef8127e104dde67322d436", + "version": "0.9.7", + "port-version": 1 + }, { "git-tree": "3ebbe45814d64c35e654ecb39cf5acf9401c793a", "version": "0.9.7", From 347d9f4d133b820bd3be0098ad3d1f833fa2559d Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 8 Apr 2022 22:50:51 +0200 Subject: [PATCH 39/59] Fixes --- ports/orc/portfile.cmake | 2 +- ports/physx/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake index a535864a9fd425..ae4aa75f35f837 100644 --- a/ports/orc/portfile.cmake +++ b/ports/orc/portfile.cmake @@ -42,7 +42,7 @@ vcpkg_cmake_configure( -DENABLE_TEST=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/orc-*) diff --git a/ports/physx/vcpkg.json b/ports/physx/vcpkg.json index aec7787acad4ab..2ed8d3b06df1f0 100644 --- a/ports/physx/vcpkg.json +++ b/ports/physx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "physx", - "version-semver": "4.1.2", + "version": "4.1.2", "port-version": 2, "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs", "homepage": "https://github.com/NVIDIAGameWorks/PhysX", From f28f767937720f94cde6b3ca93211cc14b783d96 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 8 Apr 2022 22:52:22 +0200 Subject: [PATCH 40/59] version --- versions/o-/orc.json | 2 +- versions/p-/physx.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/versions/o-/orc.json b/versions/o-/orc.json index 9e0ad91e6da3b6..5ff8985a155690 100644 --- a/versions/o-/orc.json +++ b/versions/o-/orc.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f19424d02263d4597401f8e22fa46ce0147ff948", + "git-tree": "7e57b484297f955cccc75ecc889b1a21fd05596d", "version": "1.6.4", "port-version": 3 }, diff --git a/versions/p-/physx.json b/versions/p-/physx.json index 3ff5affefc8520..e0c7f2b6b63e73 100644 --- a/versions/p-/physx.json +++ b/versions/p-/physx.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "cdf60cbb56f14439ade20d95507446f483a9fa45", - "version-semver": "4.1.2", + "git-tree": "c95b684e34b7d7990df62de1fcaad8f47b6732d9", + "version": "4.1.2", "port-version": 2 }, { From ae26d88f036a9ddb1694a288e77ba24fe0f56105 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 9 Apr 2022 00:10:12 +0200 Subject: [PATCH 41/59] fix orc --- ports/orc/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake index ae4aa75f35f837..ee22997e7721a4 100644 --- a/ports/orc/portfile.cmake +++ b/ports/orc/portfile.cmake @@ -24,8 +24,8 @@ else() set(BUILD_TOOLS ON) endif() -if(NOT VCPKG_TARGET_IS_UWP) - set(configure_opts PREFER_NINJA) +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) endif() vcpkg_cmake_configure( From 256474039643d5c30b0f392f3a927f5f9381adef Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 9 Apr 2022 00:10:21 +0200 Subject: [PATCH 42/59] version db --- versions/o-/orc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/o-/orc.json b/versions/o-/orc.json index 5ff8985a155690..841853463a003c 100644 --- a/versions/o-/orc.json +++ b/versions/o-/orc.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7e57b484297f955cccc75ecc889b1a21fd05596d", + "git-tree": "543e83b37120267db3f81b5fdb3d349717b20135", "version": "1.6.4", "port-version": 3 }, From 60bbdea987df944ca975cca9ab1fcba88c80ea7e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 12 Apr 2022 09:53:53 +0200 Subject: [PATCH 43/59] Preparing for merge with upstream --- ports/blas/CMakeLists.txt | 2 +- ports/blas/vcpkg.json | 1 + ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 4 ---- scripts/cmake/vcpkg_configure_cmake.cmake | 10 +--------- scripts/cmake/vcpkg_configure_meson.cmake | 6 +----- 5 files changed, 4 insertions(+), 19 deletions(-) diff --git a/ports/blas/CMakeLists.txt b/ports/blas/CMakeLists.txt index 72eed951867d3e..790f79e8baa70e 100644 --- a/ports/blas/CMakeLists.txt +++ b/ports/blas/CMakeLists.txt @@ -1,4 +1,4 @@ cmake_minimum_required(VERSION 3.17) -project(Find_BLAS_external LANGUAGES CXX) +project(Find_BLAS_external) find_package(BLAS REQUIRED) diff --git a/ports/blas/vcpkg.json b/ports/blas/vcpkg.json index 957fa55978d7af..d4a9bae2399408 100644 --- a/ports/blas/vcpkg.json +++ b/ports/blas/vcpkg.json @@ -2,6 +2,7 @@ "name": "blas", "version-date": "2022-03-31", "description": "Metapackage for packages which provide BLAS", + "license": null, "dependencies": [ "openblas", { diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index 8cd74d2ba67fb9..37174c50409d30 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -154,10 +154,6 @@ function(vcpkg_cmake_configure) # Prebuilt ninja binaries are only provided for x64 hosts set(ninja_can_be_used OFF) set(ninja_host OFF) - 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) - # Nonsense windows.cmake does just not correctly setup the compiler flags for UWP and Ninja endif() set(generator) diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index da09f4f1856e0e..f91523fc007e28 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -153,10 +153,6 @@ function(vcpkg_configure_cmake) # Prebuilt ninja binaries are only provided for x64 hosts set(ninja_can_be_used OFF) set(ninja_host OFF) - elseif(VCPKG_TARGET_IS_UWP) - # Ninja and MSBuild have many differences when targeting UWP, so use MSBuild to maximize existing compatibility - # set(ninja_can_be_used OFF) - # Nonsense windows.cmake does just not correctly setup the compiler flags for UWP and Ninja endif() endif() @@ -246,11 +242,7 @@ function(vcpkg_configure_cmake) if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - if(VCPKG_TARGET_IS_UWP) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/uwp.cmake") - else() - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") - endif() + 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") diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 550f287f1cffd4..e68ff652654392 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -205,11 +205,7 @@ function(z_vcpkg_meson_generate_native_file_config config_type) #https://mesonbu if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - if(VCPKG_TARGET_IS_UWP) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/uwp.cmake") - else() - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") - endif() + 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) From 68212d848f022fd7ed5e232d23d44f5512b1b63f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 12 Apr 2022 09:58:13 +0200 Subject: [PATCH 44/59] version stuff --- versions/b-/blas.json | 2 +- versions/baseline.json | 26 +++++++++++++------------- versions/i-/igraph.json | 5 +++++ versions/v-/vcpkg-cmake.json | 5 +++++ 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/versions/b-/blas.json b/versions/b-/blas.json index 4b5504b0d48d00..216d2ec521a130 100644 --- a/versions/b-/blas.json +++ b/versions/b-/blas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c7aa1a398b27db16f88c13e161e4d758ce55fd56", + "git-tree": "b6443bf91c7aecc1bdaf300809e991278d7c5564", "version-date": "2022-03-31", "port-version": 0 }, diff --git a/versions/baseline.json b/versions/baseline.json index e76999ffe9b9c8..5f036a3dffe945 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -489,8 +489,8 @@ "port-version": 0 }, "blas": { - "baseline": "1", - "port-version": 1 + "baseline": "2022-03-31", + "port-version": 0 }, "blaze": { "baseline": "3.8", @@ -826,7 +826,7 @@ }, "boost-modular-build-helper": { "baseline": "1.78.0", - "port-version": 3 + "port-version": 4 }, "boost-move": { "baseline": "1.78.0", @@ -1618,7 +1618,7 @@ }, "cpprestsdk": { "baseline": "2.10.18", - "port-version": 0 + "port-version": 1 }, "cpptoml": { "baseline": "v0.1.1", @@ -2194,7 +2194,7 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 11 + "port-version": 12 }, "ffnvcodec": { "baseline": "11.1.5.0", @@ -2890,7 +2890,7 @@ }, "igraph": { "baseline": "0.9.8", - "port-version": 0 + "port-version": 1 }, "iir1": { "baseline": "1.9.0", @@ -3438,7 +3438,7 @@ }, "libcerf": { "baseline": "1.13", - "port-version": 2 + "port-version": 3 }, "libconfig": { "baseline": "1.7.3", @@ -3702,7 +3702,7 @@ }, "liblbfgs": { "baseline": "1.10", - "port-version": 1 + "port-version": 2 }, "liblemon": { "baseline": "2019-06-13", @@ -5218,7 +5218,7 @@ }, "orc": { "baseline": "1.6.4", - "port-version": 2 + "port-version": 3 }, "orocos-kdl": { "baseline": "1.4", @@ -5378,11 +5378,11 @@ }, "physfs": { "baseline": "3.0.2", - "port-version": 6 + "port-version": 7 }, "physx": { "baseline": "4.1.2", - "port-version": 1 + "port-version": 2 }, "picojson": { "baseline": "1.3.0", @@ -6366,7 +6366,7 @@ }, "sdl2": { "baseline": "2.0.20", - "port-version": 1 + "port-version": 2 }, "sdl2-gfx": { "baseline": "1.0.4", @@ -7293,7 +7293,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-04-07", + "baseline": "2022-04-08", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/i-/igraph.json b/versions/i-/igraph.json index a37f62b31ecbba..939c556cbeb135 100644 --- a/versions/i-/igraph.json +++ b/versions/i-/igraph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a83357cbd67c5477d393ee30853d47ced4200eb8", + "version": "0.9.8", + "port-version": 1 + }, { "git-tree": "5af04d279a55817e0ca26a113a67cf48884f9aaf", "version": "0.9.8", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index fb83ccdf337642..851fd54b466a9b 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc73dd8b842c68bef26c130af73eddafdd9abdd0", + "version-date": "2022-04-08", + "port-version": 0 + }, { "git-tree": "3dcb01563c0de941013579456d19ce5b0bd08a6e", "version-date": "2022-04-07", From 491e75fa528a189ead2167242d02f361b44e21fd Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 12 Apr 2022 10:02:03 +0200 Subject: [PATCH 45/59] Update scripts/cmake/vcpkg_build_make.cmake --- scripts/cmake/vcpkg_build_make.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 546d9a0abbd17b..dd5b061eea07e6 100644 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -148,7 +148,7 @@ function(vcpkg_build_make) set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${cmake_buildtype}}") else() # dynamic set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${cmake_buildtype}}") - endif() + endif() set(LDFLAGS_${cmake_buildtype} "") if(EXISTS "${Z_VCPKG_INSTALLED}${path_suffix}/lib") string(APPEND LDFLAGS_${cmake_buildtype} " -L${Z_VCPKG_INSTALLED}${path_suffix}/lib") From 509bb44d26e9a4e5fcc9b3224dcabb3a00e2f7fe Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 14 Apr 2022 09:18:41 +0200 Subject: [PATCH 46/59] fix foreach vs if --- scripts/get_cmake_vars/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/get_cmake_vars/CMakeLists.txt b/scripts/get_cmake_vars/CMakeLists.txt index 524ef864640ff0..adcc3a057e9e11 100644 --- a/scripts/get_cmake_vars/CMakeLists.txt +++ b/scripts/get_cmake_vars/CMakeLists.txt @@ -93,9 +93,9 @@ macro(_vcpkg_adjust_flags flag_var) if(MSVC) # Transform MSVC /flags to -flags due to bash scripts intepreting /flag as a path. string(REGEX REPLACE "(^| )/" "\\1-" ${flag_var} "${${flag_var}}") if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - foreach("${flag_var}" IN_LIST CMAKE_C_FLAGS CMAKE_CXX_FLAGS) + if("${flag_var}" IN_LIST CMAKE_C_FLAGS CMAKE_CXX_FLAGS) string(APPEND ${flag_var} " -ZW:nostdlib") - endforeach() + endif() endif() endif() if(CMAKE_SYSTEM_NAME MATCHES "Darwin") From cfc5c8b5071b8f2e931e9350b49f7195d7b325b2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 14 Apr 2022 09:20:18 +0200 Subject: [PATCH 47/59] add -ZW:nostdlib to output flags of cmake_get_vars in vcpkg-cmake --- ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt index 190455d9a66969..0ccad9fd19d78f 100644 --- a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt +++ b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt @@ -147,6 +147,11 @@ foreach(flag CXX C SHARED_LINKER EXE_LINKER STATIC_LINKER RC) # Transform MSVC /flags to -flags due to bash scripts intepreting /flag as a path. # This is imperfect because it fails on directories with trailing spaces, but those are exceedingly rare string(REGEX REPLACE "(^| )/" "\\1-" ${flag}_FLAGS "${${flag}_FLAGS}") + if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + if("${flag}_FLAGS" IN_LIST C_FLAGS CXX_FLAGS) + string(APPEND ${flag}_FLAGS " -ZW:nostdlib") + endif() + endif() endif() string(REPLACE "\\" "\\\\" ${flag}_FLAGS "${${flag}_FLAGS}") string(REPLACE "\"" "\\\"" ${flag}_FLAGS "${${flag}_FLAGS}") From 363e633fee6082e8a86ccfee1bc489a6dbdfd772 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 14 Apr 2022 09:20:37 +0200 Subject: [PATCH 48/59] version stuff --- versions/v-/vcpkg-cmake.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 851fd54b466a9b..90cef3639dbd71 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "bc73dd8b842c68bef26c130af73eddafdd9abdd0", + "git-tree": "c56c1cc676925fabf297185abdf2d4a0091273af", "version-date": "2022-04-08", "port-version": 0 }, From 63d2a0d5baf4c1c754af3fd8a2f1d3cdef8aa3fd Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 14 Apr 2022 10:25:35 +0200 Subject: [PATCH 49/59] Fix if again --- ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt | 2 +- scripts/get_cmake_vars/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt index 0ccad9fd19d78f..1b86af8d87a4d6 100644 --- a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt +++ b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt @@ -148,7 +148,7 @@ foreach(flag CXX C SHARED_LINKER EXE_LINKER STATIC_LINKER RC) # This is imperfect because it fails on directories with trailing spaces, but those are exceedingly rare string(REGEX REPLACE "(^| )/" "\\1-" ${flag}_FLAGS "${${flag}_FLAGS}") if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - if("${flag}_FLAGS" IN_LIST C_FLAGS CXX_FLAGS) + if("${flag}" MATCHES "^(C|CXX)$") string(APPEND ${flag}_FLAGS " -ZW:nostdlib") endif() endif() diff --git a/scripts/get_cmake_vars/CMakeLists.txt b/scripts/get_cmake_vars/CMakeLists.txt index adcc3a057e9e11..ef037b3e3efbba 100644 --- a/scripts/get_cmake_vars/CMakeLists.txt +++ b/scripts/get_cmake_vars/CMakeLists.txt @@ -93,7 +93,7 @@ macro(_vcpkg_adjust_flags flag_var) if(MSVC) # Transform MSVC /flags to -flags due to bash scripts intepreting /flag as a path. string(REGEX REPLACE "(^| )/" "\\1-" ${flag_var} "${${flag_var}}") if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - if("${flag_var}" IN_LIST CMAKE_C_FLAGS CMAKE_CXX_FLAGS) + if("${flag_var}" MATCHES "(CMAKE_C_FLAGS|CMAKE_CXX_FLAGS)") string(APPEND ${flag_var} " -ZW:nostdlib") endif() endif() From 777973d081c5d9f31b99b0ba010883d7e4b541c2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 14 Apr 2022 10:25:47 +0200 Subject: [PATCH 50/59] version stuff --- versions/v-/vcpkg-cmake.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 90cef3639dbd71..30d30003b70d47 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c56c1cc676925fabf297185abdf2d4a0091273af", + "git-tree": "11b8114c46aae5abcbff8a6c985a63cc1f030f9b", "version-date": "2022-04-08", "port-version": 0 }, From 61427e0ee5def5914d2b35802cbdd770332d04aa Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 14 Apr 2022 10:26:13 +0200 Subject: [PATCH 51/59] forgot to save --- scripts/get_cmake_vars/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/get_cmake_vars/CMakeLists.txt b/scripts/get_cmake_vars/CMakeLists.txt index ef037b3e3efbba..e6d5c6f2da9ba8 100644 --- a/scripts/get_cmake_vars/CMakeLists.txt +++ b/scripts/get_cmake_vars/CMakeLists.txt @@ -93,7 +93,7 @@ macro(_vcpkg_adjust_flags flag_var) if(MSVC) # Transform MSVC /flags to -flags due to bash scripts intepreting /flag as a path. string(REGEX REPLACE "(^| )/" "\\1-" ${flag_var} "${${flag_var}}") if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - if("${flag_var}" MATCHES "(CMAKE_C_FLAGS|CMAKE_CXX_FLAGS)") + if("${flag_var}" MATCHES "^(CMAKE_C_FLAGS|CMAKE_CXX_FLAGS)$") string(APPEND ${flag_var} " -ZW:nostdlib") endif() endif() From 59c68b3da88985a7e097416f9a7fe77e7242ce65 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 14 Apr 2022 23:52:50 +0200 Subject: [PATCH 52/59] only add ZW to CXX flags --- ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt | 2 +- scripts/get_cmake_vars/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt index 1b86af8d87a4d6..6fa339baa2ecbe 100644 --- a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt +++ b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt @@ -148,7 +148,7 @@ foreach(flag CXX C SHARED_LINKER EXE_LINKER STATIC_LINKER RC) # This is imperfect because it fails on directories with trailing spaces, but those are exceedingly rare string(REGEX REPLACE "(^| )/" "\\1-" ${flag}_FLAGS "${${flag}_FLAGS}") if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - if("${flag}" MATCHES "^(C|CXX)$") + if("${flag}" STREQUAL "CXX") string(APPEND ${flag}_FLAGS " -ZW:nostdlib") endif() endif() diff --git a/scripts/get_cmake_vars/CMakeLists.txt b/scripts/get_cmake_vars/CMakeLists.txt index e6d5c6f2da9ba8..ec6ea55390739e 100644 --- a/scripts/get_cmake_vars/CMakeLists.txt +++ b/scripts/get_cmake_vars/CMakeLists.txt @@ -93,7 +93,7 @@ macro(_vcpkg_adjust_flags flag_var) if(MSVC) # Transform MSVC /flags to -flags due to bash scripts intepreting /flag as a path. string(REGEX REPLACE "(^| )/" "\\1-" ${flag_var} "${${flag_var}}") if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - if("${flag_var}" MATCHES "^(CMAKE_C_FLAGS|CMAKE_CXX_FLAGS)$") + if("${flag_var}" STREQUAL "CMAKE_CXX_FLAGS") string(APPEND ${flag_var} " -ZW:nostdlib") endif() endif() From f193009aa6ed23af75039fcd593c99fb14eedc0d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 17 Apr 2022 21:51:40 +0200 Subject: [PATCH 53/59] bump version due to merge --- ports/sdl2/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 613f4626edcc62..95f045e65b20a1 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2", "version": "2.0.20", - "port-version": 2, + "port-version": 3, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", "dependencies": [ From cef8bb37dc9cbd404c076aa88a119911bc4e8a2a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 17 Apr 2022 21:52:04 +0200 Subject: [PATCH 54/59] version stuff --- versions/baseline.json | 2 +- versions/s-/sdl2.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index d6431e1dbb48c4..019e57613a86bd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6370,7 +6370,7 @@ }, "sdl2": { "baseline": "2.0.20", - "port-version": 2 + "port-version": 3 }, "sdl2-gfx": { "baseline": "1.0.4", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index e5e456632f8c56..bbabe4f468583a 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24fc8b7ae34a3a363c76820d4ca50f715648a0b2", + "version": "2.0.20", + "port-version": 3 + }, { "git-tree": "abf71c19917402dddef261e80d55c8ec04e9bf54", "version": "2.0.20", From f21e9444160c67b48ae5d05ec166a2bcd76397af Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 18 Apr 2022 23:35:09 +0200 Subject: [PATCH 55/59] update version --- versions/v-/vcpkg-cmake.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 30d30003b70d47..44bdbc391161a0 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "11b8114c46aae5abcbff8a6c985a63cc1f030f9b", + "git-tree": "9350fa30123000ea0c075b4aa43ce5b6dc462d34", "version-date": "2022-04-08", "port-version": 0 }, From a334bc6dd4c6a6f727a4ba1a17d836a4a428e181 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 20 Apr 2022 09:25:40 +0200 Subject: [PATCH 56/59] version stuff --- versions/baseline.json | 24 ++++++++++++------------ versions/p-/physx.json | 5 +++++ versions/v-/vcpkg-cmake.json | 5 +++++ 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index fc44c8d760aff6..65142884ee48ae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -489,8 +489,8 @@ "port-version": 0 }, "blas": { - "baseline": "1", - "port-version": 1 + "baseline": "2022-03-31", + "port-version": 0 }, "blaze": { "baseline": "3.8", @@ -826,7 +826,7 @@ }, "boost-modular-build-helper": { "baseline": "1.78.0", - "port-version": 3 + "port-version": 4 }, "boost-move": { "baseline": "1.78.0", @@ -1622,7 +1622,7 @@ }, "cpprestsdk": { "baseline": "2.10.18", - "port-version": 0 + "port-version": 1 }, "cpptoml": { "baseline": "v0.1.1", @@ -2894,7 +2894,7 @@ }, "igraph": { "baseline": "0.9.8", - "port-version": 0 + "port-version": 1 }, "iir1": { "baseline": "1.9.0", @@ -3442,7 +3442,7 @@ }, "libcerf": { "baseline": "1.13", - "port-version": 2 + "port-version": 3 }, "libconfig": { "baseline": "1.7.3", @@ -3706,7 +3706,7 @@ }, "liblbfgs": { "baseline": "1.10", - "port-version": 1 + "port-version": 2 }, "liblemon": { "baseline": "2019-06-13", @@ -5222,7 +5222,7 @@ }, "orc": { "baseline": "1.6.4", - "port-version": 2 + "port-version": 3 }, "orocos-kdl": { "baseline": "1.4", @@ -5382,11 +5382,11 @@ }, "physfs": { "baseline": "3.0.2", - "port-version": 6 + "port-version": 7 }, "physx": { "baseline": "4.1.2", - "port-version": 2 + "port-version": 3 }, "picojson": { "baseline": "1.3.0", @@ -6370,7 +6370,7 @@ }, "sdl2": { "baseline": "2.0.20", - "port-version": 2 + "port-version": 3 }, "sdl2-gfx": { "baseline": "1.0.4", @@ -7297,7 +7297,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-04-12", + "baseline": "2022-04-21", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/p-/physx.json b/versions/p-/physx.json index 22bd529f6220c1..89e0155e0af75a 100644 --- a/versions/p-/physx.json +++ b/versions/p-/physx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "304769b6a45107c9a8abf12fad9b9d82bac22c3b", + "version": "4.1.2", + "port-version": 3 + }, { "git-tree": "8e20a94664b966271a5e7684e73b2efab2461ba8", "version-semver": "4.1.2", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index fd801a9bc4d763..6643af5d0fffd9 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8273918a04a5822ad7cc21ea5249402f2e999a7a", + "version-date": "2022-04-21", + "port-version": 0 + }, { "git-tree": "ef4a9463f802c1cd6f8b31e560529aeaee0faff4", "version-date": "2022-04-12", From fc2722330af529a94740636392862832b5160d46 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 21 Apr 2022 23:43:13 +0200 Subject: [PATCH 57/59] version stuff --- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 24 ++++++++++----------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 572f4a66c6024b..2502362696f90b 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcb306fc661bfab322c75b55472e402387396099", + "version": "1.79.0", + "port-version": 1 + }, { "git-tree": "03b0eb80e437663830851f7891d02125694b4ee0", "version": "1.79.0", diff --git a/versions/baseline.json b/versions/baseline.json index 0f80c12c0dc8a9..984dfcb500a046 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -489,8 +489,8 @@ "port-version": 0 }, "blas": { - "baseline": "1", - "port-version": 1 + "baseline": "2022-03-31", + "port-version": 0 }, "blaze": { "baseline": "3.8", @@ -826,7 +826,7 @@ }, "boost-modular-build-helper": { "baseline": "1.79.0", - "port-version": 0 + "port-version": 1 }, "boost-move": { "baseline": "1.79.0", @@ -1622,7 +1622,7 @@ }, "cpprestsdk": { "baseline": "2.10.18", - "port-version": 0 + "port-version": 1 }, "cpptoml": { "baseline": "v0.1.1", @@ -2894,7 +2894,7 @@ }, "igraph": { "baseline": "0.9.8", - "port-version": 0 + "port-version": 1 }, "iir1": { "baseline": "1.9.0", @@ -3442,7 +3442,7 @@ }, "libcerf": { "baseline": "1.13", - "port-version": 2 + "port-version": 3 }, "libconfig": { "baseline": "1.7.3", @@ -3706,7 +3706,7 @@ }, "liblbfgs": { "baseline": "1.10", - "port-version": 1 + "port-version": 2 }, "liblemon": { "baseline": "2019-06-13", @@ -5222,7 +5222,7 @@ }, "orc": { "baseline": "1.6.4", - "port-version": 2 + "port-version": 3 }, "orocos-kdl": { "baseline": "1.4", @@ -5382,11 +5382,11 @@ }, "physfs": { "baseline": "3.0.2", - "port-version": 6 + "port-version": 7 }, "physx": { "baseline": "4.1.2", - "port-version": 2 + "port-version": 3 }, "picojson": { "baseline": "1.3.0", @@ -6374,7 +6374,7 @@ }, "sdl2": { "baseline": "2.0.20", - "port-version": 2 + "port-version": 3 }, "sdl2-gfx": { "baseline": "1.0.4", @@ -7301,7 +7301,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-04-12", + "baseline": "2022-04-21", "port-version": 0 }, "vcpkg-cmake-config": { From 59cbf878462c76a727b2326a60a06c70e7d80692 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 23 Apr 2022 10:59:45 +0200 Subject: [PATCH 58/59] reset stuff --- ports/blas/portfile.cmake | 2 +- ports/blas/vcpkg.json | 10 +++------- versions/b-/blas.json | 5 ----- versions/b-/boost-modular-build-helper.json | 5 ----- versions/baseline.json | 22 ++++++++++----------- versions/c-/cpprestsdk.json | 5 ----- versions/l-/libcerf.json | 5 ----- versions/l-/liblbfgs.json | 5 ----- versions/o-/orc.json | 5 ----- versions/p-/physfs.json | 5 ----- versions/p-/physx.json | 5 ----- versions/s-/sdl2.json | 5 ----- versions/v-/vcpkg-cmake.json | 5 ----- 13 files changed, 15 insertions(+), 69 deletions(-) diff --git a/ports/blas/portfile.cmake b/ports/blas/portfile.cmake index e668d3e4beaea1..f70aa46eabd3fb 100644 --- a/ports/blas/portfile.cmake +++ b/ports/blas/portfile.cmake @@ -1,5 +1,5 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) # Make sure BLAS can be found -vcpkg_cmake_configure(SOURCE_PATH ${CURRENT_PORT_DIR} +vcpkg_configure_cmake(SOURCE_PATH ${CURRENT_PORT_DIR} OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}") diff --git a/ports/blas/vcpkg.json b/ports/blas/vcpkg.json index d4a9bae2399408..aca4cf894e418c 100644 --- a/ports/blas/vcpkg.json +++ b/ports/blas/vcpkg.json @@ -1,13 +1,9 @@ { "name": "blas", - "version-date": "2022-03-31", + "version-string": "1", + "port-version": 1, "description": "Metapackage for packages which provide BLAS", - "license": null, "dependencies": [ - "openblas", - { - "name": "vcpkg-cmake", - "host": true - } + "openblas" ] } diff --git a/versions/b-/blas.json b/versions/b-/blas.json index 216d2ec521a130..c8b3ade64a24bc 100644 --- a/versions/b-/blas.json +++ b/versions/b-/blas.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "b6443bf91c7aecc1bdaf300809e991278d7c5564", - "version-date": "2022-03-31", - "port-version": 0 - }, { "git-tree": "0d105be9337f4a6f294a7eced2da18e8cdb99051", "version-string": "1", diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 2502362696f90b..572f4a66c6024b 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "dcb306fc661bfab322c75b55472e402387396099", - "version": "1.79.0", - "port-version": 1 - }, { "git-tree": "03b0eb80e437663830851f7891d02125694b4ee0", "version": "1.79.0", diff --git a/versions/baseline.json b/versions/baseline.json index 55274d00a92986..053f8a940803ea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -489,8 +489,8 @@ "port-version": 0 }, "blas": { - "baseline": "2022-03-31", - "port-version": 0 + "baseline": "1", + "port-version": 1 }, "blaze": { "baseline": "3.8", @@ -826,7 +826,7 @@ }, "boost-modular-build-helper": { "baseline": "1.79.0", - "port-version": 1 + "port-version": 0 }, "boost-move": { "baseline": "1.79.0", @@ -1622,7 +1622,7 @@ }, "cpprestsdk": { "baseline": "2.10.18", - "port-version": 1 + "port-version": 0 }, "cpptoml": { "baseline": "v0.1.1", @@ -3442,7 +3442,7 @@ }, "libcerf": { "baseline": "1.13", - "port-version": 3 + "port-version": 2 }, "libconfig": { "baseline": "1.7.3", @@ -3706,7 +3706,7 @@ }, "liblbfgs": { "baseline": "1.10", - "port-version": 2 + "port-version": 1 }, "liblemon": { "baseline": "2019-06-13", @@ -5222,7 +5222,7 @@ }, "orc": { "baseline": "1.6.4", - "port-version": 3 + "port-version": 2 }, "orocos-kdl": { "baseline": "1.4", @@ -5382,11 +5382,11 @@ }, "physfs": { "baseline": "3.0.2", - "port-version": 7 + "port-version": 6 }, "physx": { "baseline": "4.1.2", - "port-version": 3 + "port-version": 2 }, "picojson": { "baseline": "1.3.0", @@ -6374,7 +6374,7 @@ }, "sdl2": { "baseline": "2.0.20", - "port-version": 3 + "port-version": 2 }, "sdl2-gfx": { "baseline": "1.0.4", @@ -7301,7 +7301,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-04-21", + "baseline": "2022-04-12", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/c-/cpprestsdk.json b/versions/c-/cpprestsdk.json index 4855a3314a3878..5372196d40b07d 100644 --- a/versions/c-/cpprestsdk.json +++ b/versions/c-/cpprestsdk.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "b37c56224faff461184f427b95f10dc320d74d50", - "version": "2.10.18", - "port-version": 1 - }, { "git-tree": "a4c5e50b9a83b6f9142256d1142b371da93db065", "version-string": "2.10.18", diff --git a/versions/l-/libcerf.json b/versions/l-/libcerf.json index 471bb29f3df990..7a35564988a5ec 100644 --- a/versions/l-/libcerf.json +++ b/versions/l-/libcerf.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "1aed61567fd3da5dc36a9a5290262b389ab79fa5", - "version": "1.13", - "port-version": 3 - }, { "git-tree": "e4bb4a4b841e96215ccc856fa1b8acc56270a1e4", "version-string": "1.13", diff --git a/versions/l-/liblbfgs.json b/versions/l-/liblbfgs.json index d562fe8f06f8ea..e3c7174bb55b40 100644 --- a/versions/l-/liblbfgs.json +++ b/versions/l-/liblbfgs.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "cdf2ac29eb7e040dc4eefe6d623d5caa3b592de0", - "version": "1.10", - "port-version": 2 - }, { "git-tree": "f9251e490103e48e6ba9a01c6c61468381f0c8f1", "version-string": "1.10", diff --git a/versions/o-/orc.json b/versions/o-/orc.json index 841853463a003c..23e58df0a4be31 100644 --- a/versions/o-/orc.json +++ b/versions/o-/orc.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "543e83b37120267db3f81b5fdb3d349717b20135", - "version": "1.6.4", - "port-version": 3 - }, { "git-tree": "8cd78baa4d8b7df9077f76b8f5d600aac6e09716", "version-string": "1.6.4", diff --git a/versions/p-/physfs.json b/versions/p-/physfs.json index 7961b91513989b..7e719741c5465f 100644 --- a/versions/p-/physfs.json +++ b/versions/p-/physfs.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "0acbb8771db07ce3e4641f015189fb48e732bdd5", - "version-semver": "3.0.2", - "port-version": 7 - }, { "git-tree": "17d9ad3560e379cc51921a51982f4d31d106f1ed", "version-semver": "3.0.2", diff --git a/versions/p-/physx.json b/versions/p-/physx.json index 89e0155e0af75a..22bd529f6220c1 100644 --- a/versions/p-/physx.json +++ b/versions/p-/physx.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "304769b6a45107c9a8abf12fad9b9d82bac22c3b", - "version": "4.1.2", - "port-version": 3 - }, { "git-tree": "8e20a94664b966271a5e7684e73b2efab2461ba8", "version-semver": "4.1.2", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index bbabe4f468583a..e5e456632f8c56 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "24fc8b7ae34a3a363c76820d4ca50f715648a0b2", - "version": "2.0.20", - "port-version": 3 - }, { "git-tree": "abf71c19917402dddef261e80d55c8ec04e9bf54", "version": "2.0.20", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 6643af5d0fffd9..fd801a9bc4d763 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "8273918a04a5822ad7cc21ea5249402f2e999a7a", - "version-date": "2022-04-21", - "port-version": 0 - }, { "git-tree": "ef4a9463f802c1cd6f8b31e560529aeaee0faff4", "version-date": "2022-04-12", From b0633b093c8567809cb3df3fb8dd0e8d232f7ef9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 23 Apr 2022 11:01:25 +0200 Subject: [PATCH 59/59] version stuff --- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 20 ++++++++++---------- versions/c-/cpprestsdk.json | 5 +++++ versions/i-/igraph.json | 5 +++++ versions/l-/libcerf.json | 5 +++++ versions/l-/liblbfgs.json | 5 +++++ versions/o-/orc.json | 5 +++++ versions/p-/physfs.json | 5 +++++ versions/p-/physx.json | 5 +++++ versions/s-/sdl2.json | 5 +++++ versions/v-/vcpkg-cmake.json | 5 +++++ 11 files changed, 60 insertions(+), 10 deletions(-) diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 572f4a66c6024b..2502362696f90b 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcb306fc661bfab322c75b55472e402387396099", + "version": "1.79.0", + "port-version": 1 + }, { "git-tree": "03b0eb80e437663830851f7891d02125694b4ee0", "version": "1.79.0", diff --git a/versions/baseline.json b/versions/baseline.json index 053f8a940803ea..889f1875addfbc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -826,7 +826,7 @@ }, "boost-modular-build-helper": { "baseline": "1.79.0", - "port-version": 0 + "port-version": 1 }, "boost-move": { "baseline": "1.79.0", @@ -1622,7 +1622,7 @@ }, "cpprestsdk": { "baseline": "2.10.18", - "port-version": 0 + "port-version": 1 }, "cpptoml": { "baseline": "v0.1.1", @@ -2894,7 +2894,7 @@ }, "igraph": { "baseline": "0.9.8", - "port-version": 1 + "port-version": 2 }, "iir1": { "baseline": "1.9.0", @@ -3442,7 +3442,7 @@ }, "libcerf": { "baseline": "1.13", - "port-version": 2 + "port-version": 3 }, "libconfig": { "baseline": "1.7.3", @@ -3706,7 +3706,7 @@ }, "liblbfgs": { "baseline": "1.10", - "port-version": 1 + "port-version": 2 }, "liblemon": { "baseline": "2019-06-13", @@ -5222,7 +5222,7 @@ }, "orc": { "baseline": "1.6.4", - "port-version": 2 + "port-version": 3 }, "orocos-kdl": { "baseline": "1.4", @@ -5382,11 +5382,11 @@ }, "physfs": { "baseline": "3.0.2", - "port-version": 6 + "port-version": 7 }, "physx": { "baseline": "4.1.2", - "port-version": 2 + "port-version": 3 }, "picojson": { "baseline": "1.3.0", @@ -6374,7 +6374,7 @@ }, "sdl2": { "baseline": "2.0.20", - "port-version": 2 + "port-version": 3 }, "sdl2-gfx": { "baseline": "1.0.4", @@ -7301,7 +7301,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-04-12", + "baseline": "2022-04-21", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/c-/cpprestsdk.json b/versions/c-/cpprestsdk.json index 5372196d40b07d..4855a3314a3878 100644 --- a/versions/c-/cpprestsdk.json +++ b/versions/c-/cpprestsdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b37c56224faff461184f427b95f10dc320d74d50", + "version": "2.10.18", + "port-version": 1 + }, { "git-tree": "a4c5e50b9a83b6f9142256d1142b371da93db065", "version-string": "2.10.18", diff --git a/versions/i-/igraph.json b/versions/i-/igraph.json index c500e043d03ea1..3534d70151bfce 100644 --- a/versions/i-/igraph.json +++ b/versions/i-/igraph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "562fb321b0c46134d9b876fe95a3796fd4404b24", + "version": "0.9.8", + "port-version": 2 + }, { "git-tree": "635707a7146747b8b5a35ba35d5e94669e499d3b", "version": "0.9.8", diff --git a/versions/l-/libcerf.json b/versions/l-/libcerf.json index 7a35564988a5ec..471bb29f3df990 100644 --- a/versions/l-/libcerf.json +++ b/versions/l-/libcerf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1aed61567fd3da5dc36a9a5290262b389ab79fa5", + "version": "1.13", + "port-version": 3 + }, { "git-tree": "e4bb4a4b841e96215ccc856fa1b8acc56270a1e4", "version-string": "1.13", diff --git a/versions/l-/liblbfgs.json b/versions/l-/liblbfgs.json index e3c7174bb55b40..d562fe8f06f8ea 100644 --- a/versions/l-/liblbfgs.json +++ b/versions/l-/liblbfgs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdf2ac29eb7e040dc4eefe6d623d5caa3b592de0", + "version": "1.10", + "port-version": 2 + }, { "git-tree": "f9251e490103e48e6ba9a01c6c61468381f0c8f1", "version-string": "1.10", diff --git a/versions/o-/orc.json b/versions/o-/orc.json index 23e58df0a4be31..841853463a003c 100644 --- a/versions/o-/orc.json +++ b/versions/o-/orc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "543e83b37120267db3f81b5fdb3d349717b20135", + "version": "1.6.4", + "port-version": 3 + }, { "git-tree": "8cd78baa4d8b7df9077f76b8f5d600aac6e09716", "version-string": "1.6.4", diff --git a/versions/p-/physfs.json b/versions/p-/physfs.json index 7e719741c5465f..7961b91513989b 100644 --- a/versions/p-/physfs.json +++ b/versions/p-/physfs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0acbb8771db07ce3e4641f015189fb48e732bdd5", + "version-semver": "3.0.2", + "port-version": 7 + }, { "git-tree": "17d9ad3560e379cc51921a51982f4d31d106f1ed", "version-semver": "3.0.2", diff --git a/versions/p-/physx.json b/versions/p-/physx.json index 22bd529f6220c1..89e0155e0af75a 100644 --- a/versions/p-/physx.json +++ b/versions/p-/physx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "304769b6a45107c9a8abf12fad9b9d82bac22c3b", + "version": "4.1.2", + "port-version": 3 + }, { "git-tree": "8e20a94664b966271a5e7684e73b2efab2461ba8", "version-semver": "4.1.2", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index e5e456632f8c56..bbabe4f468583a 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24fc8b7ae34a3a363c76820d4ca50f715648a0b2", + "version": "2.0.20", + "port-version": 3 + }, { "git-tree": "abf71c19917402dddef261e80d55c8ec04e9bf54", "version": "2.0.20", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index fd801a9bc4d763..6643af5d0fffd9 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8273918a04a5822ad7cc21ea5249402f2e999a7a", + "version-date": "2022-04-21", + "port-version": 0 + }, { "git-tree": "ef4a9463f802c1cd6f8b31e560529aeaee0faff4", "version-date": "2022-04-12",