Skip to content

[cmake] update cmake test port #16948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 4 commits into from
Apr 6, 2021
Merged

[cmake] update cmake test port #16948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07fcab6
[cmake] update cmake test port
Neumann-A Mar 29, 2021
2063d9c
correct hash
Neumann-A Mar 29, 2021
ae57158
remove double expat dependency
Neumann-A Mar 30, 2021
816121f
Merge remote-tracking branch 'upstream/master' into update_cmake
Neumann-A Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions scripts/test_ports/cmake/CONTROL
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions scripts/test_ports/cmake/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ vcpkg_from_gitlab(
OUT_SOURCE_PATH SOURCE_PATH
REPO cmake/cmake
REF
63a65baf4c343c73b2142078ef0045d3711dea1d
b7b0fb430397bafae4a7bd80b41d474c91a3b7f3
SHA512
7874b26adb739649ea3a8c2d8701b44ea348d5d6387e0e2a3dd87494dfeae62084593f88f46d53a161ac24c46a7712489621213b61315593df4dc2ccc728084b
3b0de26910bceaf4bc6546255bada4c502cd0fd32f44bc28b067f347c09d028c175a3243551bbe4bb64bcf312df9ff827e8fdbcb0b34a12e1ce4a26ba0799ee2
HEAD_REF master
)

Expand All @@ -18,7 +18,7 @@ vcpkg_configure_cmake(
#-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-DCMAKE_USE_SYSTEM_LIBARCHIVE=ON
-DCMAKE_USE_SYSTEM_CURL=ON
-DCMAKE_USE_SYSTEM_EXPAT=OFF # CMake is not compatible with expat 2.2.9
-DCMAKE_USE_SYSTEM_EXPAT=ON
-DCMAKE_USE_SYSTEM_ZLIB=ON
-DCMAKE_USE_SYSTEM_BZIP2=ON
-DCMAKE_USE_SYSTEM_ZSTD=ON
Expand Down
23 changes: 23 additions & 0 deletions scripts/test_ports/cmake/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"name": "cmake",
"version-string": "3.20.0",
"description": "CMake is an open-source, cross-platform family of tools designed to build, test and package software.",
"homepage": "https://cmake.org/",
"dependencies": [
"bzip2",
"curl",
"expat",
"jsoncpp",
"libarchive",
"liblzma",
"libuv",
"nghttp2",
"qt5-base",
{
"name": "qt5-winextras",
"platform": "windows"
},
"zlib",
"zstd"
]
}