aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffin Downs <grdowns@microsoft.com>2019-03-12 14:26:38 -0700
committerGriffin Downs <grdowns@microsoft.com>2019-03-12 14:26:38 -0700
commit6880f4e6e3abc556636d00925cd50716b9ad570c (patch)
tree329c2b90b820777e6f79173ea50c0a1bb9ab2d25
parent57cf77dc7287ee317aff364e37d5040a86245fc6 (diff)
downloadvcpkg-6880f4e6e3abc556636d00925cd50716b9ad570c.tar.gz
vcpkg-6880f4e6e3abc556636d00925cd50716b9ad570c.zip
Remove options var; Create var for setting APR_INSTALL_PRIVATE_H
-rw-r--r--ports/apr/portfile.cmake12
1 files changed, 8 insertions, 4 deletions
diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake
index 697c68cce..1e9de7ffb 100644
--- a/ports/apr/portfile.cmake
+++ b/ports/apr/portfile.cmake
@@ -14,15 +14,19 @@ 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)
+ set(INSTALL_PRIVATE_H ON)
+else()
+ set(INSTALL_PRIVATE_H OFF)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- OPTIONS ${OPTIONS}
+ 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