[pcre] [poco] Hardcode value of PCRE_STATIC into the pcre headers. Switch poco to use unbundled libs.

This commit is contained in:
Robert Schumacher 2016-11-17 00:28:54 -08:00
parent 6455cdd68f
commit 22108321c0
4 changed files with 14 additions and 9 deletions

View File

@ -1,4 +1,4 @@
Source: pcre
Version: 8.38
Version: 8.38-1
Description: Perl Compatible Regular Expresions
Build-Depends: zlib

View File

@ -32,6 +32,16 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
foreach(FILE ${CURRENT_PACKAGES_DIR}/include/pcre.h ${CURRENT_PACKAGES_DIR}/include/pcreposix.h)
file(READ ${FILE} PCRE_H)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
string(REPLACE "defined(PCRE_STATIC)" "1" PCRE_H "${PCRE_H}")
else()
string(REPLACE "defined(PCRE_STATIC)" "0" PCRE_H "${PCRE_H}")
endif()
file(WRITE ${FILE} "${PCRE_H}")
endforeach()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

View File

@ -1,4 +1,4 @@
Source: poco
Version: 1.7.6
Build-Depends:
Version: 1.7.6-1
Build-Depends: zlib, pcre, sqlite3, expat
Description: Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.

View File

@ -14,17 +14,12 @@ vcpkg_apply_patches(
${CMAKE_CURRENT_LIST_DIR}/config_h.patch
)
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
set(POCO_STATIC ON)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DPOCO_STATIC=${POCO_STATIC}
-DENABLE_SEVENZIP=ON
-DENABLE_TESTS=OFF
-DPOCO_UNBUNDLED=OFF # OFF means: using internal copy of sqlite, libz, pcre, expat, ...
-DPOCO_UNBUNDLED=ON # OFF means: using internal copy of sqlite, libz, pcre, expat, ...
)
vcpkg_install_cmake()