diff options
| author | nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> | 2021-07-20 12:24:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-20 10:24:58 -0700 |
| commit | 0e1dc121856eef84bf1852134e548bf9898dabac (patch) | |
| tree | 4bbae150d61121c81c33a2f4b7b92063e4db3060 /ports/apr | |
| parent | b67fab9861239e33b722b9a44f5c96dec6ca807e (diff) | |
| download | vcpkg-0e1dc121856eef84bf1852134e548bf9898dabac.tar.gz vcpkg-0e1dc121856eef84bf1852134e548bf9898dabac.zip | |
[rollup] Rollup PR 2021-07-16 (#19001)
* [rollup:2021-07-16 1/7] PR #18201 (@JackBoosY)
[vcpkg-cmake] Add check for unused cmake variables
* [rollup:2021-07-16 2/7] PR #18397 (@strega-nil)
[vcpkg_list] add new function
* [rollup:2021-07-16 3/7] PR #18782 (@strega-nil)
[scripts-audit] vcpkg_build_ninja
* [rollup:2021-07-16 4/7] PR #18784 (@strega-nil)
[scripts-audit] vcpkg_minimum_required
* [rollup:2021-07-16 5/7] PR #18785 (@strega-nil)
[scripts-audit] vcpkg_replace_string
* [rollup:2021-07-16 6/7] PR #18786 (@strega-nil)
[scripts-audit] windows scripts
* [rollup:2021-07-16 7/7] PR #18945 (@strega-nil)
[many ports] remove deprecated vcpkg_check_features call [1/5]
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Diffstat (limited to 'ports/apr')
| -rw-r--r-- | ports/apr/CONTROL | 9 | ||||
| -rw-r--r-- | ports/apr/portfile.cmake | 3 | ||||
| -rw-r--r-- | ports/apr/vcpkg.json | 13 |
3 files changed, 15 insertions, 10 deletions
diff --git a/ports/apr/CONTROL b/ports/apr/CONTROL deleted file mode 100644 index cf2c0079a..000000000 --- a/ports/apr/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: apr -Version: 1.7.0 -Port-Version: 3 -Homepage: https://apr.apache.org/ -Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems. -Supports: !uwp - -Feature: private-headers -Description: Install non-standard files required for building Apache httpd diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index de969c20f..3b9bed664 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -17,7 +17,8 @@ vcpkg_extract_source_archive_ex( if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - private-headers INSTALL_PRIVATE_H + FEATURES + private-headers INSTALL_PRIVATE_H ) vcpkg_configure_cmake( diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json new file mode 100644 index 000000000..91fb9c713 --- /dev/null +++ b/ports/apr/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "apr", + "version": "1.7.0", + "port-version": 4, + "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.", + "homepage": "https://apr.apache.org/", + "supports": "!uwp", + "features": { + "private-headers": { + "description": "Install non-standard files required for building Apache httpd" + } + } +} |