mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 22:01:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[cmake] Update to 3.17.2 (#10767)

Browse Source 
* [cmake] Update to 3.17.1

* update cmake directory name

* [cpuid] Fix install headers.

* [stormlib] Fix install headers

* [murmurhash] Fix install headers

* [metrohash] Fix install headers

* update baseline

* update baseline

* [otl] update hash

* update baseline

* [gts] Do not use ninja to avoid empty implib issue

* update baseline

* [dmlc] Re-trigger ci test

* [replxx] Re-trigger ci test

* update baseline

* [osg] Re-trigger ci test

* [replxx] Fix build failure

* Set cmake min version to 3.17.1

* update baseline

* [libnice] Re-trigger ci test

* [mlpack] Re-trigger ci test

* update to 3.17.2

* update cmake hash

* update baseline

* update baseline

* update baseline

* update baseline

* Update scripts/ci.baseline.txt

Co-authored-by: Billy O'Neal <billy.oneal@gmail.com>

* update baseline

* update baseline

* [magnum] Set magnum:arm64-windows to skip in baseline

* [nanogui] Set nanogui:arm64-windows to fail in baseline

* [nettle] Set nettle:x64-windows to fail, waiting for fix this issue in another PR

* re-trigger CI test

* update baseline

* Install unixODBC in Linux

* [nanodbc] Re-trigger CI test

* update baseline

* Remove space

* update baseline
This commit is contained in:
Jack·Boos·Yu 2020-05-20 05:47:19 +08:00 committed by GitHub
parent 9e03a3ac59
commit f23ebed76f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 119 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/cpuid/CONTROL
View File

@ -1,5 +1,5 @@
Source: cpuid
Version: 0.4.1
Version: 0.4.1-1
Homepage: https://github.com/anrieff/libcpuid
Description: Provides CPU identification for the x86 (and x86_64)
Supports: x86 | x64

13
ports/cpuid/fix-install-headers.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/libcpuid/CMakeLists.txt b/libcpuid/CMakeLists.txt
index 96533ac..d71953f 100644
--- a/libcpuid/CMakeLists.txt
+++ b/libcpuid/CMakeLists.txt
@@ -75,7 +75,7 @@ install(TARGETS cpuid
LIBRARY DESTINATION "lib"
ARCHIVE DESTINATION "lib"
RUNTIME DESTINATION "bin"
- INCLUDES DESTINATION "include")
+ PUBLIC_HEADER DESTINATION "include")
install(FILES "${project_config}" "${version_config}"
DESTINATION "${config_install_dir}"

11
ports/cpuid/portfile.cmake
View File

@ -2,11 +2,12 @@ vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64")
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO anrieff/libcpuid
REF f2ab8b7ef2c286f619d96c3ce8902cb76b801bf0
SHA512 fcd2d35994554eed80c04315f1cf3bc91f272a5051dde040fe2266d71af902b60ecfd74b6f9dc8284a22f222208c6789bfb94cc12d61de17d605265d3cd2c43d
HEAD_REF master
OUT_SOURCE_PATH SOURCE_PATH
REPO anrieff/libcpuid
REF f2ab8b7ef2c286f619d96c3ce8902cb76b801bf0
SHA512 fcd2d35994554eed80c04315f1cf3bc91f272a5051dde040fe2266d71af902b60ecfd74b6f9dc8284a22f222208c6789bfb94cc12d61de17d605265d3cd2c43d
HEAD_REF master
PATCHES fix-install-headers.patch
)
vcpkg_configure_cmake(

2
ports/dmlc/CONTROL
View File

@ -1,5 +1,5 @@
Source: dmlc
Version: 2019-08-12-1
Version: 2019-08-12-2
Homepage: https://github.com/dmlc/dmlc-core
Description: DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries.
Default-Features: openmp

9
ports/dmlc/portfile.cmake
View File

@ -1,10 +1,6 @@
include(vcpkg_common_functions)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
message(FATAL_ERROR "${PORT} currently doesn't supports UWP.")
endif()
vcpkg_fail_port_install(ON_TARGET "UWP")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
@ -40,5 +36,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/dmlc)
# Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

1
ports/gts/portfile.cmake
View File

@ -13,7 +13,6 @@ vcpkg_from_github(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)
vcpkg_install_cmake()

2
ports/libnice/CONTROL
View File

@ -1,5 +1,5 @@
Source: libnice
Version: 0.1.15-2
Version: 0.1.15-3
Homepage: https://nice.freedesktop.org
Description: Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389).
Build-Depends: glib, openssl

10
ports/libnice/portfile.cmake
View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
vcpkg_download_distfile(
ARCHIVE
URLS "https://nice.freedesktop.org/releases/libnice-0.1.15.tar.gz"
@ -24,7 +22,7 @@ vcpkg_install_cmake()
vcpkg_copy_pdbs()
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libnice)
file(COPY ${SOURCE_PATH}/COPYING.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/libnice)
file(COPY ${SOURCE_PATH}/COPYING.MPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/libnice)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/libnice/COPYING ${CURRENT_PACKAGES_DIR}/share/libnice/copyright)
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(COPY ${SOURCE_PATH}/COPYING.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(COPY ${SOURCE_PATH}/COPYING.MPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)

10
ports/magnum/CONTROL
View File

@ -1,5 +1,5 @@
Source: magnum
Version: 2019.10-1
Version: 2019.10-2
Build-Depends: corrade[utility]
Description: C++11/C++14 graphics middleware for games and data visualization
Homepage: https://magnum.graphics/
@ -137,14 +137,6 @@ Feature: windowlesseglapplication
Description: WindowlessEglApplication library
Build-Depends: magnum[gl]
Feature: eglcontext
Description: EglContext library
Build-Depends: magnum[gl]
Feature: windowlessglxapplication
Description: WindowlessGlxApplication library
Build-Depends: magnum[gl]
Feature: glxcontext
Description: GlxContext library
Build-Depends: magnum[gl]

62
ports/magnum/portfile.cmake
View File

@ -28,27 +28,49 @@ else()
set(BUILD_PLUGINS_STATIC 0)
endif()
# Handle features
set(_COMPONENT_FLAGS "")
foreach(_feature IN LISTS ALL_FEATURES)
# Uppercase the feature name and replace "-" with "_"
string(TOUPPER "${_feature}" _FEATURE)
string(REPLACE "-" "_" _FEATURE "${_FEATURE}")
# Turn "-DWITH_*=" ON or OFF depending on whether the feature
# is in the list.
if(_feature IN_LIST FEATURES)
list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=ON")
else()
list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=OFF")
endif()
endforeach()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
al-info WITH_AL_INFO
anyimageimporter WITH_ANYIMAGEIMPORTER
anyaudioimporter WITH_ANYAUDIOIMPORTER
anyimageconverter WITH_ANYIMAGECONVERTER
anysceneimporter WITH_ANYSCENEIMPORTER
audio WITH_AUDIO
debugtools WITH_DEBUGTOOLS
distancefieldconverter WITH_DISTANCEFIELDCONVERTER
fontconverter WITH_FONTCONVERTER
gl WITH_GL
gl-info WITH_GL_INFO
glfwapplication WITH_GLFWAPPLICATION
imageconverter WITH_IMAGECONVERTER
magnumfont WITH_MAGNUMFONT
magnumfontconverter WITH_MAGNUMFONTCONVERTER
meshtools WITH_MESHTOOLS
objimporter WITH_OBJIMPORTER
tgaimageconverter WITH_TGAIMAGECONVERTER
opengltester WITH_OPENGLTESTER
primitives WITH_PRIMITIVES
sdl2application WITH_SDL2APPLICATION
scenegraph WITH_SCENEGRAPH
shaders WITH_SHADERS
text WITH_TEXT
texturetools WITH_TEXTURETOOLS
tgaimporter WITH_TGAIMPORTER
trade WITH_TRADE
wavaudioimporter WITH_WAVAUDIOIMPORTER
windowlesswglapplication WITH_WINDOWLESSWGLAPPLICATION
eglcontext WITH_EGLCONTEXT
cglcontext WITH_CGLCONTEXT
glxcontext WITH_GLXCONTEXT
wglcontext WITH_WGLCONTEXT
windowlesseglapplication WITH_WINDOWLESSEGLAPPLICATION
windowlessglxapplication WITH_WINDOWLESSGLXAPPLICATION
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA # Disable this option if project cannot be built with Ninja
OPTIONS
${_COMPONENT_FLAGS}
${FEATURE_OPTIONS}
-DBUILD_STATIC=${BUILD_STATIC}
-DBUILD_PLUGINS_STATIC=${BUILD_PLUGINS_STATIC}
-DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d
@ -57,6 +79,8 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_copy_pdbs()
# Drop a copy of tools
if(NOT VCPKG_CMAKE_SYSTEM_NAME)
set(EXE_SUFFIX .exe)
@ -105,8 +129,4 @@ else()
file(COPY ${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/magnum-d)
endif()
# Handle copyright
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/magnum)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/magnum/COPYING ${CURRENT_PACKAGES_DIR}/share/magnum/copyright)
vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

3
ports/metrohash/CMakeLists.txt
View File

@ -31,7 +31,8 @@ install(TARGETS metrohash
EXPORT "${TARGETS_EXPORT_NAME}"
LIBRARY DESTINATION "lib"
ARCHIVE DESTINATION "lib"
INCLUDES DESTINATION "include")
PUBLIC_HEADER DESTINATION "include")
install(
FILES "${project_config}"
DESTINATION "${config_install_dir}"

2
ports/mlpack/CONTROL
View File

@ -1,5 +1,5 @@
Source: mlpack
Version: 3.2.2-1
Version: 3.2.2-2
Homepage: https://github.com/mlpack/mlpack
Description: mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms.
Build-Depends: openblas (!osx), clapack (!osx), boost, armadillo, ensmallen

4
ports/mlpack/portfile.cmake
View File

@ -33,8 +33,6 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
if("tools" IN_LIST FEATURES)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
file(GLOB MLPACK_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe)
@ -45,3 +43,5 @@ if("tools" IN_LIST FEATURES)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
ports/murmurhash/CMakeLists.txt
View File

@ -42,7 +42,7 @@ install(TARGETS murmurhash
EXPORT "${TARGETS_EXPORT_NAME}"
LIBRARY DESTINATION "lib"
ARCHIVE DESTINATION "lib"
INCLUDES DESTINATION "include")
PUBLIC_HEADER DESTINATION "include")
install(FILES "${project_config}" "${version_config}"
DESTINATION "${config_install_dir}"

2
ports/murmurhash/CONTROL
View File

@ -1,4 +1,4 @@
Source: murmurhash
Version: 2016-01-09-2
Version: 2016-01-09-3
Homepage: https://github.com/aappleby/smhasher
Description: MurmurHash a family of hash functions.

2
ports/nanodbc/CONTROL
View File

@ -1,4 +1,4 @@
Source: nanodbc
Version: 2.12.4-5
Version: 2.12.4-7
Homepage: https://github.com/lexicalunit/nanodbc
Description: A small C++ wrapper for the native C ODBC API.

2
ports/opencc/CONTROL
View File

@ -1,5 +1,5 @@
Source: opencc
Version: 2020-04-26-1
Version: 2020-04-26-2
Description: A project for conversion between Traditional and Simplified Chinese
Homepage: https://github.com/BYVoid/OpenCC
Supports: !(arm|arm64|uwp)

2
ports/opencc/portfile.cmake
View File

@ -47,4 +47,4 @@ endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
ports/osg/portfile.cmake
View File

@ -134,4 +134,4 @@ endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/)
# Handle copyright
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)

2
ports/podofo/CONTROL
View File

@ -1,5 +1,5 @@
Source: podofo
Version: 0.9.6-7
Version: 0.9.6-8
Homepage: https://sourceforge.net/projects/podofo/
Description: PoDoFo is a library to work with the PDF file format
Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openssl, freetype

5
ports/podofo/portfile.cmake
View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
set(PODOFO_VERSION 0.9.6)
vcpkg_download_distfile(ARCHIVE
URLS "https://sourceforge.net/projects/podofo/files/podofo/${PODOFO_VERSION}/podofo-${PODOFO_VERSION}.tar.gz/download"
@ -56,5 +54,4 @@ vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/podofo)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/podofo/COPYING ${CURRENT_PACKAGES_DIR}/share/podofo/copyright)
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
ports/replxx/CONTROL
View File

@ -1,5 +1,5 @@
Source: replxx
Version: 0.0.2
Version: 0.0.2-1
Homepage: https://github.com/AmokHuginnsson/replxx
Description: A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters.
Supports: !uwp

4
ports/replxx/portfile.cmake
View File

@ -11,6 +11,7 @@ vcpkg_from_github(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
DISABLE_PARALLEL_CONFIGURE
)
vcpkg_install_cmake()
@ -18,5 +19,6 @@ vcpkg_install_cmake()
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/replxxConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

1
ports/stormlib/CMakeLists.txt
View File

@ -274,6 +274,7 @@ install(TARGETS stormlib EXPORT stormlibConfig
RUNTIME DESTINATION bin
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
PUBLIC_HEADER DESTINATION include
)
install(EXPORT stormlibConfig NAMESPACE stormlib:: DESTINATION share/stormlib)

2
ports/stormlib/CONTROL
View File

@ -1,4 +1,4 @@
Source: stormlib
Version: 2019-05-10
Version: 2019-05-10-1
Build-Depends: zlib, bzip2
Description: StormLib is a library for opening and manipulating Blizzard MPQ files

3
scripts/azure-pipelines/linux/provision-image.sh
View File

@ -43,6 +43,9 @@ sudo apt update
sudo add-apt-repository universe
sudo apt install -y powershell
# Install odbc
sudo apt install -y unixodbc-dev
# Write SMB credentials
sudo mkdir /etc/smbcredentials
smbCredentialFile=/etc/smbcredentials/$StorageAccountName.cred

34
scripts/ci.baseline.txt
View File

@ -69,7 +69,6 @@ ampl-mp:arm-uwp=fail
ampl-mp:x64-uwp=fail
angelscript:arm64-windows=fail
angelscript:arm-uwp=fail
antlr4:arm64-windows=fail
antlr4:arm-uwp=fail
antlr4:x64-uwp=fail
anyrpc:arm-uwp=ignore
@ -131,7 +130,6 @@ bde:x86-windows=fail
benchmark:arm64-windows=fail
benchmark:arm-uwp=fail
benchmark:x64-uwp=fail
berkeleydb:arm64-windows=fail
berkeleydb:arm-uwp=fail
berkeleydb:x64-linux=fail
berkeleydb:x64-osx=fail
@ -194,6 +192,7 @@ caf:arm64-windows=fail
caf:x64-uwp=fail
caf:x64-linux=ignore
caffe2:x86-windows=fail
caffe2:arm64-windows=fail
cairomm:x64-linux=fail
capnproto:arm64-windows=fail
capnproto:arm-uwp=fail
@ -243,6 +242,7 @@ civetweb:arm64-windows = skip
civetweb:arm-uwp = skip
civetweb:x64-uwp = skip
clapack:x64-uwp=fail
clblas:arm64-windows=fail
clblast:x64-osx=ignore
clblast:x64-linux=fail
clblast:x64-windows-static=fail
@ -268,7 +268,6 @@ coolprop:x64-uwp=fail
coroutine:arm-uwp=fail
coroutine:x64-linux=fail
coroutine:x64-uwp=fail
corrade:arm64-windows=fail
corrade:arm-uwp=fail
corrade:x64-uwp=fail
cppcms:x64-linux=fail
@ -316,7 +315,6 @@ cudnn:arm-uwp=fail
cudnn:x64-uwp=fail
cudnn:x64-windows-static=fail
cudnn:x86-windows=fail
date:arm64-windows=fail
dbow2:x64-osx=fail
dcmtk:arm-uwp=fail
dcmtk:arm64-windows=fail
@ -485,7 +483,6 @@ freerdp:arm64-windows=fail
freerdp:arm-uwp=fail
freerdp:x64-osx=fail
freerdp:x64-uwp=fail
freetds:arm64-windows=fail
freetds:arm-uwp=fail
freetds:x64-linux=fail
freetds:x64-osx=fail
@ -547,7 +544,6 @@ gl3w:arm64-windows=fail
gl3w:arm-uwp=fail
glew:arm64-windows=fail
glew:arm-uwp=fail
glfw3:arm64-windows=fail
glfw3:arm-uwp=fail
glfw3:x64-uwp=fail
glib:x64-uwp=fail
@ -571,7 +567,6 @@ gperf:arm-uwp=fail
gperftools:arm64-windows=fail
gperftools:x64-uwp=fail
gperftools:arm-uwp=fail
graphicsmagick:arm64-windows=fail
graphicsmagick:arm-uwp=fail
graphicsmagick:x64-uwp=fail
graphite2:arm-uwp=fail
@ -665,6 +660,7 @@ isal:x86-windows=fail
itk:x64-windows=fail
itk:x64-windows-static=fail
itk:x86-windows=fail
itk:x64-osx=fail
ixwebsocket:x64-linux=ignore
jack2:arm-uwp=fail
jack2:x64-uwp=fail
@ -679,7 +675,6 @@ jemalloc:x64-uwp=fail
jemalloc:x64-windows-static=fail
jinja2cpplight:arm-uwp=fail
jinja2cpplight:x64-uwp=fail
keystone:arm64-windows=fail
keystone:arm-uwp=fail
keystone:x64-uwp=fail
kinectsdk1:arm64-windows=fail
@ -698,13 +693,10 @@ lcm:x64-linux=fail
lcm:x64-osx=fail
leptonica:x64-uwp=fail
leptonica:arm-uwp=fail
leptonica:arm64-windows=fail
leveldb:arm-uwp=fail
leveldb:x64-uwp=fail
libaiff:x64-linux=fail
libarchive:arm64-windows=fail
libarchive:arm-uwp=fail
libarchive:x64-uwp=fail
libass:x64-windows-static=fail
libb2:x86-windows=fail
libb2:x64-windows=fail
@ -735,7 +727,6 @@ libdatrie:x64-linux=fail
libdatrie:x64-osx=fail
libdisasm:arm-uwp=fail
libdisasm:x64-uwp=fail
libdshowcapture:arm64-windows=fail
libdshowcapture:arm-uwp=fail
libdshowcapture:x64-linux=fail
libdshowcapture:x64-osx=fail
@ -762,7 +753,6 @@ libfabric:x64-uwp=fail
libfabric:x64-windows=ignore
libfreenect2:arm64-windows=fail
libgd:x64-linux=ignore
libgit2:arm64-windows=fail
libgit2:arm-uwp=fail
libgit2:x64-uwp=fail
libgo:arm-uwp=fail
@ -968,7 +958,6 @@ libusbmuxd:arm-uwp=fail
libusbmuxd:x64-uwp=fail
libusbmuxd:x64-linux=fail
libusbmuxd:x64-osx=fail
libusb-win32:arm64-windows=fail
libusb-win32:arm-uwp=fail
libusb-win32:x64-linux=fail
libusb-win32:x64-osx=fail
@ -983,7 +972,6 @@ libuuid:x64-uwp=fail
libuuid:x64-windows=fail
libuuid:x64-windows-static=fail
libuuid:x86-windows=fail
libuv:arm64-windows=fail
libuv:arm-uwp=fail
libuv:x64-uwp=fail
libvmdk:arm-uwp=fail
@ -1021,7 +1009,6 @@ llgl:x64-uwp=fail
llvm:arm-uwp=fail
llvm:arm64-windows=fail
llvm:x64-uwp=fail
lmdb:arm64-windows=fail
lmdb:arm-uwp=fail
lmdb:x64-uwp=fail
log4cplus:arm-uwp=fail
@ -1045,6 +1032,7 @@ luajit:x86-windows = skip
luasocket:x64-linux=fail
luasocket:x64-osx=fail
lzfse:arm-uwp=fail
magnum:arm64-windows=skip
marl:arm-uwp=fail
marl:x64-uwp=fail
mathgl:x64-osx=fail
@ -1191,9 +1179,10 @@ nana:x64-linux=fail
nana:x64-osx=fail
nana:x64-uwp=fail
nanodbc:arm-uwp=fail
nanodbc:x64-linux=fail
nanodbc:x64-osx=fail
nanodbc:x64-uwp=fail
nanodbc:x64-linux=skip
nanogui:arm64-windows=fail
nanorange:arm64-windows=fail
nanorange:arm-uwp=fail
nanorange:x64-linux=fail
@ -1214,6 +1203,7 @@ nativefiledialog:x64-uwp=fail
netcdf-cxx4:x64-linux=ignore
nethost:x64-uwp=fail
nethost:arm-uwp=fail
nettle:x64-windows=skip
networkdirect-sdk:arm64-windows=fail
networkdirect-sdk:arm-uwp=fail
networkdirect-sdk:x64-linux=fail
@ -1283,7 +1273,6 @@ opencensus-cpp:x64-windows=fail
opencensus-cpp:x64-windows-static=fail
opencensus-cpp:x86-windows=fail
opencensus-cpp:x64-uwp=fail
opencl:arm64-windows=fail
opencl:arm-uwp=fail
opencl:x64-uwp=fail
opencolorio:x64-linux=ignore
@ -1467,7 +1456,6 @@ portaudio:x64-uwp=fail
portaudio:x64-windows-static=fail
portaudio:x64-windows=fail
portaudio:x86-windows=fail
portmidi:arm64-windows=fail
portmidi:arm-uwp=fail
portmidi:x64-linux=fail
portmidi:x64-osx=fail
@ -1584,7 +1572,6 @@ raylib:arm-uwp=fail
raylib:x64-uwp=fail
readline:arm-uwp=fail
readline:x64-uwp=fail
readline-win32:arm64-windows=fail
readline-win32:arm-uwp=fail
readline-win32:x64-linux=fail
readline-win32:x64-osx=fail
@ -1645,7 +1632,6 @@ sciter:x64-uwp=fail
sciter:x64-windows-static=fail
scnlib:arm-uwp=fail
scnlib:x64-uwp=fail
scylla-wrapper:arm64-windows=fail
scylla-wrapper:arm-uwp=fail
scylla-wrapper:x64-linux=fail
scylla-wrapper:x64-osx=fail
@ -1815,6 +1801,7 @@ tensorflow-cc:x86-windows=fail
tesseract:x64-windows=ignore
tesseract:x64-windows-static=ignore
tesseract:x86-windows=ignore
tesseract:arm64-windows=fail
tfhe:x86-windows=fail
tfhe:x64-windows=fail
tfhe:x64-windows-static=fail
@ -1926,6 +1913,7 @@ vxl:x64-uwp = skip
vxl:x64-windows = skip
vxl:x64-windows-static = skip
vxl:x86-windows = skip
wampcc:arm64-windows=fail
wampcc:x64-linux=ignore
wangle:x64-linux=ignore
wavpack:arm64-windows=fail
@ -1957,6 +1945,7 @@ wintoast:x64-uwp=fail
woff2:x64-linux=fail
woff2:x64-osx=fail
woff2:x64-windows-static=fail
wpilib:arm64-windows=fail
wpilib:x64-osx=fail
wxchartdir:x64-osx=fail
wxwidgets:x64-linux=fail
@ -1972,7 +1961,7 @@ x265:arm64-windows=fail
x265:arm-uwp=fail
x265:x64-uwp=fail
xalan-c:x64-windows-static=fail
xerces-c:arm64-windows=fail
xalan-c:arm64-windows=fail
xerces-c:arm-uwp=fail
xerces-c:x64-uwp=fail
xeus:x64-linux=ignore
@ -1992,7 +1981,6 @@ x-plane:x64-linux=fail
x-plane:x86-windows=fail
yajl:arm-uwp=fail
yajl:x64-uwp=fail
yara:arm64-windows=fail
yara:arm-uwp=fail
yara:x64-uwp=fail
yasm:arm64-windows=fail

30
scripts/vcpkgTools.xml
View File

@ -1,25 +1,25 @@
<?xml version="1.0"?>
<tools version="2">
<tool name="cmake" os="windows">
<version>3.14.0</version>
<exeRelativePath>cmake-3.14.0-win32-x86\bin\cmake.exe</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-win32-x86.zip</url>
<sha512>60eb6a0790883da4152a957bd1133405f620f4b7a073af3bea97695b3ef8c22c41d9b90e45815f2a896df5be0cd6dedb73a6df5f17a42761ca8f457c9f3b708c</sha512>
<archiveName>cmake-3.14.0-win32-x86.zip</archiveName>
<version>3.17.2</version>
<exeRelativePath>cmake-3.17.2-win32-x86\bin\cmake.exe</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.17.2/cmake-3.17.2-win32-x86.zip</url>
<sha512>63bb3dc5a8683ed193025450620a70b8dd675eccba4a83882c96f21eda8994dd5b21854036a0c17f978bf31f67d1d1b33b416c7f6ffb0470c9f48c2e495d44c1</sha512>
<archiveName>cmake-3.17.2-win32-x86.zip</archiveName>
</tool>
<tool name="cmake" os="osx">
<version>3.14.0</version>
<exeRelativePath>cmake-3.14.0-Darwin-x86_64/CMake.app/Contents/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Darwin-x86_64.tar.gz</url>
<sha512>a5a7217a049be3bb2ef5c93292b1d92eb4dd5ec6ab2dd04984aae01d2732eb343cea4f9741b333a5e21a27eb7934f568f780f3558e7ff870150c3309fc4656b3</sha512>
<archiveName>cmake-3.14.0-Darwin-x86_64.tar.gz</archiveName>
<version>3.17.2</version>
<exeRelativePath>cmake-3.17.2-Darwin-x86_64/CMake.app/Contents/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.17.2/cmake-3.17.2-Darwin-x86_64.tar.gz</url>
<sha512>804b06439c05b9cf36a988223b7dc47b06b8613cb4653989eff52aad5ab0fa312b8da1ac0c760ad101e74b2c9edaf5b119bd48617a5efb57dff9380ca74e54a9</sha512>
<archiveName>cmake-3.17.2-Darwin-x86_64.tar.gz</archiveName>
</tool>
<tool name="cmake" os="linux">
<version>3.14.0</version>
<exeRelativePath>cmake-3.14.0-Linux-x86_64/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Linux-x86_64.tar.gz</url>
<sha512>e687c0f3acfb15c880ddac67e2821907f833cb900c6ecedb4ab5df5102604d82753c948e3c7dca6e5bcce6278a09b7d577b1afade2e133aec5b2057ac48d3c74</sha512>
<archiveName>cmake-3.14.0-Linux-x86_64.tar.gz</archiveName>
<version>3.17.2</version>
<exeRelativePath>cmake-3.17.2-Linux-x86_64/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.17.2/cmake-3.17.2-Linux-x86_64.tar.gz</url>
<sha512>2afc023363c40b110d97d871fb9a8917643bba308ca0c029ee8fe1164db1c168e32b2c9d7647475d84efa290c1242357f7cf260ea4d1f92f5a829cf418955490</sha512>
<archiveName>cmake-3.17.2-Linux-x86_64.tar.gz</archiveName>
</tool>
<tool name="cmake" os="freebsd">
<version>3.12.4</version>

2
toolsrc/src/vcpkg/tools.cpp
View File

@ -264,7 +264,7 @@ namespace vcpkg
virtual const std::string& tool_data_name() const override { return m_exe; }
virtual const std::string& exe_stem() const override { return m_exe; }
virtual std::array<int, 3> default_min_version() const override { return {3, 5, 1}; }
virtual std::array<int, 3> default_min_version() const override { return {3, 17, 1}; }
virtual void add_special_paths(std::vector<fs::path>& out_candidate_paths) const override
{