3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

update to cmake 3.14 (allow VS2019RC)

Browse Source
This commit is contained in:
kiwixz 2019-03-16 17:40:31 +01:00
parent d7bf0e5819
commit b755c30bc7
2 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/cmake/vcpkg_configure_cmake.cmake
View File

@ -109,16 +109,11 @@ function(vcpkg_configure_cmake)
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
set(GENERATOR "Visual Studio 15 2017") set(GENERATOR "Visual Studio 15 2017")
set(ARCH "ARM64") set(ARCH "ARM64")
elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v142") elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
if(NOT VCPKG_CMAKE_SYSTEM_NAME) set(GENERATOR "Visual Studio 16 2019")
set(VCPKG_CMAKE_SYSTEM_NAME Windows) set(ARCH "${VCPKG_TARGET_ARCHITECTURE}")
endif()
message(FATAL_ERROR
"Unable to determine appropriate CMake MSBuild generator for: ${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}.
This is because CMake 3.12.4 does not currently have a 'Visual Studio 16 2019' option.
This can be worked around by either:
1. Install Visual Studio 2017 Stable
")
else() else()
if(NOT VCPKG_CMAKE_SYSTEM_NAME) if(NOT VCPKG_CMAKE_SYSTEM_NAME)
set(VCPKG_CMAKE_SYSTEM_NAME Windows) set(VCPKG_CMAKE_SYSTEM_NAME Windows)

40
scripts/vcpkgTools.xml
View File

@ -1,32 +1,32 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<tools version="2"> <tools version="2">
<tool name="cmake" os="windows"> <tool name="cmake" os="windows">
<version>3.12.4</version> <version>3.14.0</version>
<exeRelativePath>cmake-3.12.4-win32-x86\bin\cmake.exe</exeRelativePath> <exeRelativePath>cmake-3.14.0-win32-x86\bin\cmake.exe</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.12.4/cmake-3.12.4-win32-x86.zip</url> <url>https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-win32-x86.zip</url>
<sha512>ca7097c5917101c39d5fa5325cd256ad3aa616a7e5811915cb2869c24961dc133726015b3576908fbd0666f89c8e31886bed9cf6b532a3fe44681d5245bc25c7</sha512> <sha512>60eb6a0790883da4152a957bd1133405f620f4b7a073af3bea97695b3ef8c22c41d9b90e45815f2a896df5be0cd6dedb73a6df5f17a42761ca8f457c9f3b708c</sha512>
<archiveName>cmake-3.12.4-win32-x86.zip</archiveName> <archiveName>cmake-3.14.0-win32-x86.zip</archiveName>
</tool> </tool>
<tool name="cmake" os="osx"> <tool name="cmake" os="osx">
<version>3.12.4</version> <version>3.14.0</version>
<exeRelativePath>cmake-3.12.4-Darwin-x86_64/CMake.app/Contents/bin/cmake</exeRelativePath> <exeRelativePath>cmake-3.14.0-Darwin-x86_64/CMake.app/Contents/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.12.4/cmake-3.12.4-Darwin-x86_64.tar.gz</url> <url>https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Darwin-x86_64.tar.gz</url>
<sha512>67ce23394d9679818ab0f2792f5d585c8c6f385e18584d488a47d48b768d1ee20b58247d22945aeff1ff9f84b7e843457dac98a50801ac3068ab1fbcbe0b0f45</sha512> <sha512>a5a7217a049be3bb2ef5c93292b1d92eb4dd5ec6ab2dd04984aae01d2732eb343cea4f9741b333a5e21a27eb7934f568f780f3558e7ff870150c3309fc4656b3</sha512>
<archiveName>cmake-3.12.4-Darwin-x86_64.tar.gz</archiveName> <archiveName>cmake-3.14.0-Darwin-x86_64.tar.gz</archiveName>
</tool> </tool>
<tool name="cmake" os="linux"> <tool name="cmake" os="linux">
<version>3.12.4</version> <version>3.14.0</version>
<exeRelativePath>cmake-3.12.4-Linux-x86_64/bin/cmake</exeRelativePath> <exeRelativePath>cmake-3.14.0-Linux-x86_64/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.12.4/cmake-3.12.4-Linux-x86_64.tar.gz</url> <url>https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Linux-x86_64.tar.gz</url>
<sha512>ee9eded0c72e06ef99554f09553d40842478700ca6f07319c28247f1d45301708c703c65ad617cf618833257bacc3b9f63a54b32288bfb619d38758669dcd20f</sha512> <sha512>e687c0f3acfb15c880ddac67e2821907f833cb900c6ecedb4ab5df5102604d82753c948e3c7dca6e5bcce6278a09b7d577b1afade2e133aec5b2057ac48d3c74</sha512>
<archiveName>cmake-3.12.4-Linux-x86_64.tar.gz</archiveName> <archiveName>cmake-3.14.0-Linux-x86_64.tar.gz</archiveName>
</tool> </tool>
<tool name="cmake" os="freebsd"> <tool name="cmake" os="freebsd">
<version>3.12.4</version> <version>3.14.0</version>
<exeRelativePath>cmake-3.12.4-FreeBSD-x86_64/bin/cmake</exeRelativePath> <exeRelativePath></exeRelativePath>
<url>https://github.com/ivysnow/CMake/releases/download/v3.12.4/cmake-3.12.4-FreeBSD-x86_64.tar.gz</url> <url></url>
<sha512>b5aeb2de36f3c29757c9404e33756da88580ddfa07f29079c7f275ae0d6d018fdfe3f55d54d1403f38e359865cf93436e084c6b1ea91f26c88bc01dde3793479</sha512> <sha512></sha512>
<archiveName>cmake-3.12.4-FreeBSD-x86_64.tar.gz</archiveName> <archiveName></archiveName>
</tool> </tool>
<tool name="git" os="windows"> <tool name="git" os="windows">
<version>2.20.0</version> <version>2.20.0</version>