diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2021-01-17 04:26:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-16 19:26:38 -0800 |
| commit | f89336d703bf3ffd2aa4f832f214b42a11c7d044 (patch) | |
| tree | 891f90e6a3e714c4af552984425a2987cfe0d352 /scripts | |
| parent | 31eda3e931f30a480d90eac5f5ffa9fa9944121d (diff) | |
| download | vcpkg-f89336d703bf3ffd2aa4f832f214b42a11c7d044.tar.gz vcpkg-f89336d703bf3ffd2aa4f832f214b42a11c7d044.zip | |
[libarchive+tesseract+opencv] add missing libarchiveConfig.cmake, fix tesseract downstream and unblock opencv CI (#15089)
* [tesseract] add missing reference for downstream projects
* [tesseract] restore ci, fix many regressions that are uncovered by that
* Update ports/opencv2/CONTROL
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* [opencv] fix regressions on uwp, accept failure on arm64 for now
* Apply suggestions from code review
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* [opencv4] allow failures on all arm windows targets, both win32 and uwp
* adopts hints from #15180
* [libarchive] bump control version
* [libarchive] use vcpkg-cmake-wrapper instead of a custom libarchiveConfig, since it is vcpkg-provided and not port-provided
* enable features to be visible in parent scope
* apply documentation fix from CI
* [libarchive] remove unnecessary lines in portfile
* fix regressions
* Update ports/gdcm/CONTROL
* use more compact logic syntax
* add new versions to baseline
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ci.baseline.txt | 9 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_check_features.cmake | 44 | ||||
| -rw-r--r-- | scripts/test_ports/vcpkg-ci-opencv/CONTROL | 4 | ||||
| -rw-r--r-- | scripts/test_ports/vcpkg-ci-paraview/CONTROL | 4 |
4 files changed, 29 insertions, 32 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c8f6c14d8..95241f5e7 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -365,8 +365,6 @@ gasol:arm64-windows=fail gasol:arm-uwp=fail gasol:x64-uwp=fail gdal:x64-windows-static-md=fail -gdcm:arm64-windows=fail -gdcm:x64-linux = skip geos:arm-uwp=fail geos:x64-uwp=fail @@ -1140,6 +1138,8 @@ opencv3:x64-windows = skip opencv3:x64-windows-static = skip opencv3:x64-windows-static-md=skip opencv3:x86-windows = skip +opencv4:arm64-windows = fail +opencv4:arm-uwp = fail opendnp3:x64-uwp=fail opendnp3:arm-uwp=fail openexr:arm64-windows=fail @@ -1567,11 +1567,6 @@ teemo:arm64-windows=fail teemo:x64-osx=fail telnetpp:arm-uwp=fail telnetpp:x64-uwp=fail -tesseract:x64-windows=fail -tesseract:x64-windows-static=fail -tesseract:x64-windows-static-md=fail -tesseract:x86-windows=fail -tesseract:arm64-windows=fail tfhe:x86-windows=fail tfhe:x64-windows=fail tfhe:x64-windows-static=fail diff --git a/scripts/cmake/vcpkg_check_features.cmake b/scripts/cmake/vcpkg_check_features.cmake index c22903eaa..be4e1265c 100644 --- a/scripts/cmake/vcpkg_check_features.cmake +++ b/scripts/cmake/vcpkg_check_features.cmake @@ -5,7 +5,7 @@ Check if one or more features are a part of a package installation. ## Usage ```cmake vcpkg_check_features( - OUT_FEATURE_OPTIONS <FEATURE_OPTIONS> + OUT_FEATURE_OPTIONS <FEATURE_OPTIONS> [FEATURES <cuda> <WITH_CUDA> [<opencv> <WITH_OPENCV>] @@ -16,27 +16,27 @@ vcpkg_check_features( ...] ) ``` -`vcpkg_check_features()` accepts these parameters: +`vcpkg_check_features()` accepts these parameters: -* `OUT_FEATURE_OPTIONS`: - An output variable, the function will clear the variable passed to `OUT_FEATURE_OPTIONS` +* `OUT_FEATURE_OPTIONS`: + An output variable, the function will clear the variable passed to `OUT_FEATURE_OPTIONS` and then set it to contain a list of option definitions (`-D<OPTION_NAME>=ON|OFF`). - + This should be set to `FEATURE_OPTIONS` by convention. - -* `FEATURES`: - A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs. - For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of: - + +* `FEATURES`: + A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs. + For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of: + * `-D<OPTION_NAME>=ON`, if a feature is specified for installation, - * `-D<OPTION_NAME>=OFF`, otherwise. + * `-D<OPTION_NAME>=OFF`, otherwise. + +* `INVERTED_FEATURES`: + A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs, uses reversed logic from `FEATURES`. + For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of: -* `INVERTED_FEATURES`: - A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs, uses reversed logic from `FEATURES`. - For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of: - * `-D<OPTION_NAME>=OFF`, if a feature is specified for installation, - * `-D<OPTION_NAME>=ON`, otherwise. + * `-D<OPTION_NAME>=ON`, otherwise. ## Notes @@ -45,8 +45,8 @@ The `FEATURES` name parameter can be omitted if no `INVERTED_FEATURES` are used. At least one (`FEATURE_NAME`, `OPTION_NAME`) pair must be passed to the function call. -Arguments passed to `FEATURES` and `INVERTED_FEATURES` are not validated to prevent duplication. -If the same (`FEATURE_NAME`, `OPTION_NAME`) pair is passed to both lists, +Arguments passed to `FEATURES` and `INVERTED_FEATURES` are not validated to prevent duplication. +If the same (`FEATURE_NAME`, `OPTION_NAME`) pair is passed to both lists, two conflicting definitions are added to `OUT_FEATURE_OPTIONS`. @@ -114,7 +114,7 @@ vcpkg_configure_cmake( # Expands to "-DWITH_CUDA=ON; -DBUILD_CUDA=ON; -DBUILD_GPU=ON" ${FEATURE_OPTIONS} ) -``` +``` ### Example 4: Use regular and inverted features @@ -136,7 +136,7 @@ vcpkg_configure_cmake( # Expands to "-DWITH_TBB=ON; -DROCKSDB_IGNORE_PACKAGE_TBB=OFF" ${FEATURE_OPTIONS} ) -``` +``` ## Examples in portfiles @@ -172,8 +172,10 @@ function(vcpkg_check_features) set(_vcf_FEATURE_VARIABLE ${_vcf_ARG}) if(${_vcf_FEATURE_NAME} IN_LIST FEATURES) list(APPEND _vcf_FEATURE_OPTIONS "-D${_vcf_FEATURE_VARIABLE}=${_set_if}") + set(${_vcf_FEATURE_VARIABLE} "${_set_if}" PARENT_SCOPE) else() list(APPEND _vcf_FEATURE_OPTIONS "-D${_vcf_FEATURE_VARIABLE}=${_set_else}") + set(${_vcf_FEATURE_VARIABLE} "${_set_else}" PARENT_SCOPE) endif() set(_vcf_IS_FEATURE_NAME_ARG ON) endif() @@ -185,7 +187,7 @@ function(vcpkg_check_features) if (DEFINED _vcf_FEATURES OR DEFINED _vcf_INVERTED_FEATURES) _check_features(_vcf_FEATURES ON OFF) _check_features(_vcf_INVERTED_FEATURES OFF ON) - else() + else() # Skip arguments that correspond to OUT_FEATURE_OPTIONS and its value. list(SUBLIST ARGN 2 -1 _vcf_ARGN) _check_features(_vcf_ARGN ON OFF) diff --git a/scripts/test_ports/vcpkg-ci-opencv/CONTROL b/scripts/test_ports/vcpkg-ci-opencv/CONTROL index 3456988cf..46e451828 100644 --- a/scripts/test_ports/vcpkg-ci-opencv/CONTROL +++ b/scripts/test_ports/vcpkg-ci-opencv/CONTROL @@ -1,6 +1,6 @@ Source: vcpkg-ci-opencv
Version: 1
-Port-Version: 1
+Port-Version: 2
Homepage: https://github.com/microsoft/vcpkg
Description: Port to force features of certain ports within CI
-Build-Depends: opencv[nonfree,ade,contrib,dnn,eigen,ffmpeg,gdcm,ipp,jasper,jpeg,openexr,opengl,openmp,png,qt,sfm,tiff,vtk]
+Build-Depends: opencv[core,nonfree,ade,contrib,dnn,eigen,ffmpeg,gdcm,ipp,jasper,jpeg,lapack,openexr,opengl,openmp,png,qt,sfm,tiff,vtk,webp](!uwp&!(windows&(arm|arm64))), opencv[core,nonfree,ade,contrib,dnn,eigen,ffmpeg,jpeg,png,tiff,webp](uwp|(windows&(arm|arm64)))
diff --git a/scripts/test_ports/vcpkg-ci-paraview/CONTROL b/scripts/test_ports/vcpkg-ci-paraview/CONTROL index d4816dbf3..137750842 100644 --- a/scripts/test_ports/vcpkg-ci-paraview/CONTROL +++ b/scripts/test_ports/vcpkg-ci-paraview/CONTROL @@ -1,6 +1,6 @@ Source: vcpkg-ci-paraview
Version: 1
-Port-Version: 1
+Port-Version: 2
Homepage: https://github.com/microsoft/vcpkg
Description: Port to force features of certain ports within CI
-Build-Depends: paraview[vtkm, tools]
+Build-Depends: paraview[core,vtkm,tools](!(x86&windows)), paraview[core,tools](x86&windows)
|
