aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffin Downs <35574547+grdowns@users.noreply.github.com>2019-03-12 14:44:51 -0700
committerGitHub <noreply@github.com>2019-03-12 14:44:51 -0700
commit77becdc97a3b2ae5ae2c6cdd2f4edc4c184b8135 (patch)
tree47cfe9ce877adb28d46043af294baf98b0d3e939
parent1d4485cec5b678b7bcecf2d5ea5839af858bf765 (diff)
parent6880f4e6e3abc556636d00925cd50716b9ad570c (diff)
downloadvcpkg-77becdc97a3b2ae5ae2c6cdd2f4edc4c184b8135.tar.gz
vcpkg-77becdc97a3b2ae5ae2c6cdd2f4edc4c184b8135.zip
Merge pull request #5580 from JackBoosY/dev/jack/2181
[apr]Add feature to enable option "APR_INSTALL_PRIVATE_H" to build non-standard files.
-rw-r--r--ports/apr/CONTROL5
-rw-r--r--ports/apr/portfile.cmake12
2 files changed, 15 insertions, 2 deletions
diff --git a/ports/apr/CONTROL b/ports/apr/CONTROL
index b4ea1f213..19be22b19 100644
--- a/ports/apr/CONTROL
+++ b/ports/apr/CONTROL
@@ -1,3 +1,6 @@
Source: apr
-Version: 1.6.5
+Version: 1.6.5-1
Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.
+
+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 40ced3049..1e9de7ffb 100644
--- a/ports/apr/portfile.cmake
+++ b/ports/apr/portfile.cmake
@@ -14,9 +14,19 @@ vcpkg_download_distfile(ARCHIVE
)
vcpkg_extract_source_archive(${ARCHIVE})
+if("private-headers" IN_LIST FEATURES)
+ set(INSTALL_PRIVATE_H ON)
+else()
+ set(INSTALL_PRIVATE_H OFF)
+endif()
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- OPTIONS -DINSTALL_PDB=OFF -DMIN_WINDOWS_VER=Windows7 -DAPR_HAVE_IPV6=ON
+ OPTIONS
+ -DINSTALL_PDB=OFF
+ -DMIN_WINDOWS_VER=Windows7
+ -DAPR_HAVE_IPV6=ON
+ -DAPR_INSTALL_PRIVATE_H=${INSTALL_PRIVATE_H}
# OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
# OPTIONS_RELEASE -DOPTIMIZE=1
# OPTIONS_DEBUG -DDEBUGGABLE=1