From fe626490f0f3537fc85f47f76d5bcd16ea539dea Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 12 Mar 2019 00:47:12 +0000 Subject: [apr]Modify cmake file instead of make a patch. --- ports/apr/fix-missing-headers.patch | 13 ------------- ports/apr/portfile.cmake | 8 +------- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 ports/apr/fix-missing-headers.patch 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 -- cgit v1.2.3