diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-05-28 12:51:57 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-05-28 12:51:57 -0700 |
| commit | e6b5e1d7916feaf95dc47765e77b2f0732164b9b (patch) | |
| tree | 48687e798ab1c574e2f734390fc0ed6c6b3010a7 /ports/pcre/fix-option-2.patch | |
| parent | b1104ad7e5f0e410bf4b03ca53a39d8affb6c41c (diff) | |
| download | vcpkg-e6b5e1d7916feaf95dc47765e77b2f0732164b9b.tar.gz vcpkg-e6b5e1d7916feaf95dc47765e77b2f0732164b9b.zip | |
[pcre] Bump version and split fix-option.patch into two to preserve compat with previous port versions
Diffstat (limited to 'ports/pcre/fix-option-2.patch')
| -rw-r--r-- | ports/pcre/fix-option-2.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/ports/pcre/fix-option-2.patch b/ports/pcre/fix-option-2.patch new file mode 100644 index 000000000..f9d8e0e5e --- /dev/null +++ b/ports/pcre/fix-option-2.patch @@ -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) |