mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 11:39:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[pcre] Bump version and split fix-option.patch into two to preserve compat with previous port versions

Browse Source
This commit is contained in:
Robert Schumacher 2017-05-28 12:51:57 -07:00
parent b1104ad7e5
commit e6b5e1d791
4 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/pcre/CONTROL
View File

@ -1,3 +1,3 @@
Source: pcre
Version: 8.40
Version: 8.40-1
Description: Perl Compatible Regular Expresions

24
ports/pcre/fix-option-2.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git b/CMakeLists.txt a/CMakeLists.txt
index 858a34bd..d1a64570 100644
--- b/CMakeLists.txt
+++ a/CMakeLists.txt
@@ -74,7 +74,6 @@ PROJECT(PCRE C CXX)
# CMP0026 to avoid warnings for the use of LOCATION in GET_TARGET_PROPERTY.
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
-CMAKE_POLICY(SET CMP0026 OLD)
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # for FindReadline.cmake
@@ -191,9 +190,8 @@ IF (MINGW)
ENDIF(MINGW)
IF(MSVC)
- OPTION(PCRE_STATIC_RUNTIME
- "ON=Compile against the static runtime (/MT)."
- OFF)
+ add_definitions(/wd4703)
+ OPTION(PCRE_STATIC_RUNTIME "ON=Compile against the static runtime (/MT)." OFF)
OPTION(INSTALL_MSVC_PDB
"ON=Install .pdb files built by MSVC, if generated"
OFF)

19
ports/pcre/fix-option.patch
View File

@ -2,23 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42451ad..858a34b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,7 +74,6 @@ PROJECT(PCRE C CXX)
# CMP0026 to avoid warnings for the use of LOCATION in GET_TARGET_PROPERTY.
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
-CMAKE_POLICY(SET CMP0026 OLD)
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # for FindReadline.cmake
@@ -191,9 +190,8 @@ IF (MINGW)
@@ -191,7 +191,7 @@ IF (MINGW)
ENDIF(MINGW)
IF(MSVC)
- OPTION(PCRE_STATIC_RUNTIME OFF CACHE BOOL
- "ON=Compile against the static runtime (/MT)."
- OFF)
+ add_definitions(/wd4703)
+ OPTION(PCRE_STATIC_RUNTIME "ON=Compile against the static runtime (/MT)." OFF)
+ OPTION(PCRE_STATIC_RUNTIME
"ON=Compile against the static runtime (/MT)."
OFF)
OPTION(INSTALL_MSVC_PDB
"ON=Install .pdb files built by MSVC, if generated"
OFF)

3
ports/pcre/portfile.cmake
View File

@ -19,7 +19,8 @@ vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-option.patch
${CMAKE_CURRENT_LIST_DIR}/fix-arm-config-define.patch)
${CMAKE_CURRENT_LIST_DIR}/fix-option-2.patch
${CMAKE_CURRENT_LIST_DIR}/fix-arm-config-define.patch)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}