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 | |
| 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
| -rw-r--r-- | ports/pcre/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pcre/fix-option-2.patch | 24 | ||||
| -rw-r--r-- | ports/pcre/fix-option.patch | 19 | ||||
| -rw-r--r-- | ports/pcre/portfile.cmake | 3 |
4 files changed, 31 insertions, 17 deletions
diff --git a/ports/pcre/CONTROL b/ports/pcre/CONTROL index f1b583592..aeabb2012 100644 --- a/ports/pcre/CONTROL +++ b/ports/pcre/CONTROL @@ -1,3 +1,3 @@ Source: pcre -Version: 8.40 +Version: 8.40-1 Description: Perl Compatible Regular Expresions 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) diff --git a/ports/pcre/fix-option.patch b/ports/pcre/fix-option.patch index bbaf4df91..d1a2b13eb 100644 --- a/ports/pcre/fix-option.patch +++ b/ports/pcre/fix-option.patch @@ -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) diff --git a/ports/pcre/portfile.cmake b/ports/pcre/portfile.cmake index 9e5a933ff..f2088ef69 100644 --- a/ports/pcre/portfile.cmake +++ b/ports/pcre/portfile.cmake @@ -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} |