diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-03-29 23:28:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-29 23:28:03 -0700 |
| commit | f5c04ea6b4ebc02fd8acfc941ad1014000265ba9 (patch) | |
| tree | 09303308d29a90f0452e7563f9fa706121efc262 | |
| parent | 1c05aa9770e4afab260e0b990c495bf8326c1eef (diff) | |
| parent | 8d8cea2be0e9e00bbbd92f49585615925321bb51 (diff) | |
| download | vcpkg-f5c04ea6b4ebc02fd8acfc941ad1014000265ba9.tar.gz vcpkg-f5c04ea6b4ebc02fd8acfc941ad1014000265ba9.zip | |
Removes string replacement on Abseil headers (#5850)
Abseil now has all uses of min and max wrapped in parens to prevent macro expansion. This will continue to be the case going forward, so these replacements are no longer needed.
Also, the Github web UI is forcing an extra change that updates the return character to the proper Windows CR+LF
| -rw-r--r-- | ports/abseil/portfile.cmake | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index 7a72def39..ddf17c87c 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -7,7 +7,7 @@ endif() vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO abseil/abseil-cpp
- REF 540e2537b92cd4abfae6ceddfe24304345461f32 + REF 540e2537b92cd4abfae6ceddfe24304345461f32
SHA512 3cabab23ad159592562a30531052bb18c66fce75f93f84a6de17a7488b7d6651f645950c1adb8dfbacc651f2bc0db82c316de132baab38e3ef95ea5b5a0eb6d2
HEAD_REF master
PATCHES fix-usage-lnk-error.patch
@@ -24,14 +24,6 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-abseil TARGET_PATH share/unofficial-abseil)
-file(GLOB_RECURSE HEADERS ${CURRENT_PACKAGES_DIR}/include/*)
-foreach(FILE ${HEADERS})
- file(READ "${FILE}" _contents)
- string(REPLACE "std::min(" "(std::min)(" _contents "${_contents}")
- string(REPLACE "std::max(" "(std::max)(" _contents "${_contents}")
- file(WRITE "${FILE}" "${_contents}")
-endforeach()
-
vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/abseil RENAME copyright)
|