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

[cmake-user] Update old CMake to 3.16 (#42203)

Browse Source
This commit is contained in:
Kai Pastor 2024-11-19 07:49:57 +01:00 committed by GitHub
parent 2a8dc1b6d9
commit acd031980f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
scripts/test_ports/cmake-user/portfile.cmake
View File

@ -4,38 +4,48 @@ set(cmake_commands "")
if("cmake-current" IN_LIST FEATURES) if("cmake-current" IN_LIST FEATURES)
list(APPEND cmake_commands "${CMAKE_COMMAND}") list(APPEND cmake_commands "${CMAKE_COMMAND}")
endif() endif()
if("cmake-3-7" IN_LIST FEATURES) if("cmake-3-16" IN_LIST FEATURES)
set(cmake_version 3.7.2) # For convenient updates, use
# vcpkg install ... --cmake-args=-DVCPKG_CMAKE_USER_UPDATE=1
set(cmake_version 3.16.3)
set(legacy_cmake_archive NOTFOUND)
string(REGEX REPLACE "([^.]*[.][^.]*).*" "\\1" cmake_major_minor "${cmake_version}") string(REGEX REPLACE "([^.]*[.][^.]*).*" "\\1" cmake_major_minor "${cmake_version}")
if(VCPKG_HOST_IS_WINDOWS) if(VCPKG_HOST_IS_WINDOWS OR VCPKG_CMAKE_USER_UPDATE)
set(name "cmake-${cmake_version}-win32-x86") set(name "cmake-${cmake_version}-win64-x64")
vcpkg_download_distfile(legacy_cmake_archive vcpkg_download_distfile(legacy_cmake_archive
FILENAME "${name}.zip" FILENAME "${name}.zip"
URLS "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/${name}.zip" URLS "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/${name}.zip"
"https://cmake.org/files/v${cmake_major_minor}/${name}.zip" "https://cmake.org/files/v${cmake_major_minor}/${name}.zip"
SHA512 c359a22e2e688da1513db195280d6e8987bc8d570a0c543f1b1dfc8572fe4fd6c23d951ec5d5eae640fcca3bef3ae469083511474796ade8c6319d8bc4e4b38d SHA512 724d22f3736f0f3503ceb6b49ebec64cd569c4c16ad4fae8ac38918b09ee67e3eaa8072e30546f14f4c13bb94c5639ec940ea1b4695c94225b2a597bb4da1ede
) )
set(cmake_bin_dir "/bin") set(cmake_bin_dir "/bin")
elseif(VCPKG_HOST_IS_OSX) endif()
if(VCPKG_HOST_IS_OSX OR VCPKG_CMAKE_USER_UPDATE)
set(name "cmake-${cmake_version}-Darwin-x86_64") set(name "cmake-${cmake_version}-Darwin-x86_64")
vcpkg_download_distfile(legacy_cmake_archive vcpkg_download_distfile(legacy_cmake_archive
FILENAME "${name}.tar.gz" FILENAME "${name}.tar.gz"
URLS "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/${name}.tar.gz" URLS "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/${name}.tar.gz"
"https://cmake.org/files/v${cmake_major_minor}/${name}.tar.gz" "https://cmake.org/files/v${cmake_major_minor}/${name}.tar.gz"
SHA512 8e41608f4dd998020acf2bd1b0dab4aec37b3ea9e228f2c4a457cd1c0339d94db38a0548b4b07a9e3605f9beb11a3f6737a72813586c4ad5f730d74038a14c2b SHA512 3e59e2406f4e088b60922fbf23e92e1be3bb34c00f919625210fd93c059b5e6785afa40d3a501f36b281cde29de592f2ccffade6fa3980d0cf31dc845483184f
) )
set(cmake_bin_dir "/CMake.app/Contents/bin") set(cmake_bin_dir "/CMake.app/Contents/bin")
elseif(VCPKG_HOST_IS_LINUX) endif()
if(VCPKG_HOST_IS_LINUX OR VCPKG_CMAKE_USER_UPDATE)
set(name "cmake-${cmake_version}-Linux-x86_64") set(name "cmake-${cmake_version}-Linux-x86_64")
vcpkg_download_distfile(legacy_cmake_archive vcpkg_download_distfile(legacy_cmake_archive
FILENAME "${name}.tar.gz" FILENAME "${name}.tar.gz"
URLS "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/${name}.tar.gz" URLS "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/${name}.tar.gz"
"https://cmake.org/files/v${cmake_major_minor}/${name}.tar.gz" "https://cmake.org/files/v${cmake_major_minor}/${name}.tar.gz"
SHA512 459909fcfb9c74993c3d4ab9db4e31ea940515b670db44d039de611d813099895e695467cc8da24824315486e38e2f3e246aa92d6236c51103822ec8a39e3168 SHA512 03be16ad06fcabe40a36d0a510fdb58f5612108aed70cef7f68879d82b9e04ad62a9d0c30f3406df618ec219c74fc27b4be533d970bc60ac22333951d6cabe1a
) )
set(cmake_bin_dir "/bin") set(cmake_bin_dir "/bin")
else() endif()
message(FATAL_ERROR "Unable to test feature 'cmake-3-7' for '${HOST_TRIPLET}' host.") if(NOT legacy_cmake_archive)
message(FATAL_ERROR "Unable to test feature 'cmake-3-16' for '${HOST_TRIPLET}' host.")
endif()
if(VCPKG_CMAKE_USER_UPDATE)
message(STATUS "All downloads are up-to-date.")
message(FATAL_ERROR "Stopping due to VCPKG_CMAKE_USER_UPDATE being enabled.")
endif() endif()
vcpkg_extract_source_archive(legacy_cmake vcpkg_extract_source_archive(legacy_cmake
@ -46,11 +56,7 @@ if("cmake-3-7" IN_LIST FEATURES)
list(APPEND cmake_commands "${legacy_cmake}${cmake_bin_dir}/cmake") list(APPEND cmake_commands "${legacy_cmake}${cmake_bin_dir}/cmake")
endif() endif()
if(DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES})
set(NINJA "ninja")
else()
vcpkg_find_acquire_program(NINJA) vcpkg_find_acquire_program(NINJA)
endif()
function(get_packages out_packages cmake_version) function(get_packages out_packages cmake_version)
set(packages "") set(packages "")

41
scripts/test_ports/cmake-user/vcpkg.json
View File

@ -1,36 +1,20 @@
{ {
"name": "cmake-user", "name": "cmake-user",
"version-date": "2022-11-12", "version-string": "ci",
"description": "Test port to verify the vcpkg toolchain in cmake user projects", "description": "Test port to verify the vcpkg toolchain in cmake user projects",
"license": "MIT", "license": "MIT",
"default-features": [ "default-features": [
"ci"
],
"features": {
"ci": {
"description": "The CI set of features to test",
"dependencies": [
{ {
"name": "cmake-user", "name": "cmake-3-16",
"default-features": false, "platform": "x64 & (windows | linux | osx) & !uwp"
"features": [ },
"cmake-current", "cmake-current",
"find-package", "find-package",
"pkg-check-modules" "pkg-check-modules"
]
},
{
"name": "cmake-user",
"default-features": false,
"features": [
"cmake-3-7"
], ],
"platform": "x64 & (windows | linux | osx) & !uwp" "features": {
} "cmake-3-16": {
] "description": "Run the tests with CMake 3.16"
},
"cmake-3-7": {
"description": "Run the tests with CMake 3.7"
}, },
"cmake-current": { "cmake-current": {
"description": "Run the tests with vcpkg's current version of CMake" "description": "Run the tests with vcpkg's current version of CMake"
@ -58,14 +42,11 @@
}, },
{ {
"$package": "Fontconfig", "$package": "Fontconfig",
"$since": "3.14",
"name": "fontconfig", "name": "fontconfig",
"platform": "!mingw & !uwp" "platform": "!mingw & !uwp"
}, },
{ {
"$comment": "CMake 3.13 for debug postfix support",
"$package": "GLUT", "$package": "GLUT",
"$since": "3.13",
"name": "freeglut", "name": "freeglut",
"platform": "!uwp & !osx" "platform": "!uwp & !osx"
}, },
@ -75,9 +56,7 @@
"default-features": false "default-features": false
}, },
{ {
"$comment": "CMake 3.9 for find_dependency forwarding extra arguments",
"$package": "GDAL", "$package": "GDAL",
"$since": "3.9",
"name": "gdal", "name": "gdal",
"default-features": false, "default-features": false,
"platform": "!uwp" "platform": "!uwp"
@ -107,7 +86,6 @@
}, },
{ {
"$package": "Iconv", "$package": "Iconv",
"$since": "3.11",
"name": "libiconv" "name": "libiconv"
}, },
{ {
@ -129,16 +107,12 @@
"platform": "!uwp & !mingw" "platform": "!uwp & !mingw"
}, },
{ {
"$comment": "CMake 3.11 because it needs Iconv",
"$package": "LibXml2", "$package": "LibXml2",
"$since": "3.11",
"name": "libxml2", "name": "libxml2",
"default-features": false "default-features": false
}, },
{ {
"$comment": "CMake 3.11 because it needs Iconv",
"$package": "LibXslt", "$package": "LibXslt",
"$since": "3.11",
"name": "libxslt", "name": "libxslt",
"default-features": false, "default-features": false,
"platform": "!uwp & !mingw" "platform": "!uwp & !mingw"
@ -159,7 +133,6 @@
}, },
{ {
"$package": "SQLite3", "$package": "SQLite3",
"$since": "3.14",
"name": "sqlite3", "name": "sqlite3",
"default-features": false "default-features": false
}, },