aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffin Downs <grdowns@microsoft.com>2019-03-12 13:37:08 -0700
committerGriffin Downs <grdowns@microsoft.com>2019-03-12 13:37:08 -0700
commitff28cc2d220fdc58d4633f65f0bdf36f08df20db (patch)
tree2d7940fb714ed2cdcd50e8224bb5f8e1f9ddc6e3
parentb29b874ae9007a4450b736cabbf3cd94a4ec6359 (diff)
downloadvcpkg-ff28cc2d220fdc58d4633f65f0bdf36f08df20db.tar.gz
vcpkg-ff28cc2d220fdc58d4633f65f0bdf36f08df20db.zip
Express install private headers as feature
-rw-r--r--ports/apr/CONTROL3
-rw-r--r--ports/apr/portfile.cmake8
2 files changed, 10 insertions, 1 deletions
diff --git a/ports/apr/CONTROL b/ports/apr/CONTROL
index 18d4f36cf..0327d6c75 100644
--- a/ports/apr/CONTROL
+++ b/ports/apr/CONTROL
@@ -1,3 +1,6 @@
Source: apr
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 \ No newline at end of file
diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake
index 51795c1a4..697c68cce 100644
--- a/ports/apr/portfile.cmake
+++ b/ports/apr/portfile.cmake
@@ -14,9 +14,15 @@ vcpkg_download_distfile(ARCHIVE
)
vcpkg_extract_source_archive(${ARCHIVE})
+set(OPTIONS -DINSTALL_PDB=OFF -DMIN_WINDOWS_VER=Windows7 -DAPR_HAVE_IPV6=ON)
+
+if("private-headers" IN_LIST FEATURES)
+ set(OPTIONS ${OPTIONS} -DAPR_INSTALL_PRIVATE_H=ON)
+endif()
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- OPTIONS -DINSTALL_PDB=OFF -DMIN_WINDOWS_VER=Windows7 -DAPR_HAVE_IPV6=ON -DAPR_INSTALL_PRIVATE_H=ON
+ OPTIONS ${OPTIONS}
# OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
# OPTIONS_RELEASE -DOPTIMIZE=1
# OPTIONS_DEBUG -DDEBUGGABLE=1