diff options
| author | JackBoosY <yuzaiyang@beyondsoft.com> | 2019-03-12 00:47:12 +0000 |
|---|---|---|
| committer | JackBoosY <yuzaiyang@beyondsoft.com> | 2019-03-12 00:50:17 +0000 |
| commit | fe626490f0f3537fc85f47f76d5bcd16ea539dea (patch) | |
| tree | 9c494466071397979538bd45b31609e01098b19d | |
| parent | 443579a0642dec70705f04412df0bbd55c606709 (diff) | |
| download | vcpkg-fe626490f0f3537fc85f47f76d5bcd16ea539dea.tar.gz vcpkg-fe626490f0f3537fc85f47f76d5bcd16ea539dea.zip | |
[apr]Modify cmake file instead of make a patch.
| -rw-r--r-- | ports/apr/fix-missing-headers.patch | 13 | ||||
| -rw-r--r-- | ports/apr/portfile.cmake | 8 |
2 files changed, 1 insertions, 20 deletions
diff --git a/ports/apr/fix-missing-headers.patch b/ports/apr/fix-missing-headers.patch deleted file mode 100644 index 14986f001..000000000 --- a/ports/apr/fix-missing-headers.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b4632c3..d9e4eab 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,7 +19,7 @@ PROJECT(APR C)
-
- CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
--OPTION(APR_INSTALL_PRIVATE_H "Install selected private .h files (for httpd)" OFF)
-+OPTION(APR_INSTALL_PRIVATE_H "Install selected private .h files (for httpd)" ON)
- OPTION(APR_HAVE_IPV6 "IPv6 support" ON)
- OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON)
- OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF)
diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 8d2b7bd40..51795c1a4 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -14,15 +14,9 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - fix-missing-headers.patch -) - 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=ON # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 |