diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-08-17 23:33:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-17 08:33:44 -0700 |
| commit | d6285bc24b2e48da2f5e057fc759aff7c2b3b0af (patch) | |
| tree | 0ae728a70e64d9758f6a918e515171f83424116b /scripts | |
| parent | 5dd2b6736b7397e740d54ec2d748b56bd56350e9 (diff) | |
| download | vcpkg-d6285bc24b2e48da2f5e057fc759aff7c2b3b0af.tar.gz vcpkg-d6285bc24b2e48da2f5e057fc759aff7c2b3b0af.zip | |
[expat] Update the version to 2.2.9 (add support for uwp) (#9146)
* [expat] Update the version to 2.2.9(support uwp)
* [readosm] Fix expat.lib cannot be found
* Remove expat:arm-uwp and expat:x64-uwp from fail list in ci.baseline.txt
* [apr-util,io2d,skia] Fix expat cannot be found and also update expat
* [many ports] Add supports and fix the regressions
* Fix new regressions
* Fix typo
* [io2d] Update expat patch
* [io2d,libkml,skia] Fix expat cannot find and also fix typo
* [expat] Remove usage
* [libkml,vtk] Update expat patch and fix static build
* [wxwidgets] Fix static build caused by expat cannot found
* Update as review suggestion
* Add Port-Version
* Remove evpp:x64-osx=fail from ci.baseline.txt
* [wxwidgest] Remove unnecessary spaces
* [itk] Fix expat cannot be found
* fix cmake test port
* [wxwidgets] Update Port-Version
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ci.baseline.txt | 4 | ||||
| -rw-r--r-- | scripts/test_ports/cmake/CONTROL | 2 | ||||
| -rw-r--r-- | scripts/test_ports/cmake/portfile.cmake | 10 |
3 files changed, 7 insertions, 9 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0ca4b30d9..3abe12625 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -395,8 +395,6 @@ epsilon:arm-uwp=fail epsilon:x64-linux=fail epsilon:x64-osx=fail epsilon:x64-uwp=fail -expat:arm-uwp=fail -expat:x64-uwp=fail faad2:x64-linux=fail faad2:x64-osx=fail fann:arm-uwp=fail @@ -1483,8 +1481,6 @@ readline-win32:arm-uwp=fail readline-win32:x64-linux=fail readline-win32:x64-osx=fail readline-win32:x64-uwp=fail -readosm:x64-linux=fail -readosm:x64-osx=fail realsense2:arm64-windows=fail realsense2:arm-uwp=fail realsense2:x64-linux=fail diff --git a/scripts/test_ports/cmake/CONTROL b/scripts/test_ports/cmake/CONTROL index ba5848dbc..8eb6a661f 100644 --- a/scripts/test_ports/cmake/CONTROL +++ b/scripts/test_ports/cmake/CONTROL @@ -1,5 +1,5 @@ Source: cmake -Version: 3.17.2 +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 9f41be53c..932e1feed 100644 --- a/scripts/test_ports/cmake/portfile.cmake +++ b/scripts/test_ports/cmake/portfile.cmake @@ -3,8 +3,10 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.kitware.com/ OUT_SOURCE_PATH SOURCE_PATH REPO cmake/cmake - REF 615129f3ebd308abeaaee7f5f0689e7fc4616c28 - SHA512 5f02e05b7e6119c9c165c868d0679e0fbe5cc6b4f081a4e63a87d663c029bc378327ec042ae6bfd16bf48737bfaa5bae3be33a6dd33648e1f47cdc1a2370c366 + REF + 63a65baf4c343c73b2142078ef0045d3711dea1d + SHA512 + 7874b26adb739649ea3a8c2d8701b44ea348d5d6387e0e2a3dd87494dfeae62084593f88f46d53a161ac24c46a7712489621213b61315593df4dc2ccc728084b HEAD_REF master ) @@ -16,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=ON + -DCMAKE_USE_SYSTEM_EXPAT=OFF # CMake is not compatible with expat 2.2.9 -DCMAKE_USE_SYSTEM_ZLIB=ON -DCMAKE_USE_SYSTEM_BZIP2=ON -DCMAKE_USE_SYSTEM_ZSTD=ON @@ -50,4 +52,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) # Handle copyright -configure_file(${SOURCE_PATH}/Copyright.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
\ No newline at end of file +configure_file(${SOURCE_PATH}/Copyright.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) |