diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-04-06 22:22:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-06 13:22:44 -0700 |
| commit | 4278a5f9eafbdadfaa65d7aafd914964841cba42 (patch) | |
| tree | 4126ffdc038fad92c0ea3956dbe587ac4a56b415 /scripts | |
| parent | 88f0e6a94b785f387bc714772d0e8878a2b6059a (diff) | |
| download | vcpkg-4278a5f9eafbdadfaa65d7aafd914964841cba42.tar.gz vcpkg-4278a5f9eafbdadfaa65d7aafd914964841cba42.zip | |
[cmake] update cmake test port (#16948)
* [cmake] update cmake test port
* correct hash
add expat as dependency
* remove double expat dependency
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/test_ports/cmake/CONTROL | 5 | ||||
| -rw-r--r-- | scripts/test_ports/cmake/portfile.cmake | 6 | ||||
| -rw-r--r-- | scripts/test_ports/cmake/vcpkg.json | 23 |
3 files changed, 26 insertions, 8 deletions
diff --git a/scripts/test_ports/cmake/CONTROL b/scripts/test_ports/cmake/CONTROL deleted file mode 100644 index 8eb6a661f..000000000 --- a/scripts/test_ports/cmake/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: cmake -Version: 3.18.1 -Build-Depends: qt5-base, qt5-winextras (windows), bzip2, expat, jsoncpp, liblzma, zlib, zstd, libarchive, curl, libuv, nghttp2 -Homepage: https://cmake.org/ -Description: CMake is an open-source, cross-platform family of tools designed to build, test and package software. diff --git a/scripts/test_ports/cmake/portfile.cmake b/scripts/test_ports/cmake/portfile.cmake index 932e1feed..b08df8afb 100644 --- a/scripts/test_ports/cmake/portfile.cmake +++ b/scripts/test_ports/cmake/portfile.cmake @@ -4,9 +4,9 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO cmake/cmake REF - 63a65baf4c343c73b2142078ef0045d3711dea1d + b7b0fb430397bafae4a7bd80b41d474c91a3b7f3 SHA512 - 7874b26adb739649ea3a8c2d8701b44ea348d5d6387e0e2a3dd87494dfeae62084593f88f46d53a161ac24c46a7712489621213b61315593df4dc2ccc728084b + 3b0de26910bceaf4bc6546255bada4c502cd0fd32f44bc28b067f347c09d028c175a3243551bbe4bb64bcf312df9ff827e8fdbcb0b34a12e1ce4a26ba0799ee2 HEAD_REF master ) @@ -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 diff --git a/scripts/test_ports/cmake/vcpkg.json b/scripts/test_ports/cmake/vcpkg.json new file mode 100644 index 000000000..5ffb7f124 --- /dev/null +++ b/scripts/test_ports/cmake/vcpkg.json @@ -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" + ] +} |