mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-18 13:38:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removes string replacement on Abseil headers

Browse Source 
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
This commit is contained in:
CJ Johnson 2019-03-28 11:11:30 -04:00 committed by GitHub
parent 78a8de6cf4
commit 8d8cea2be0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ports/abseil/portfile.cmake
View File

@ -7,7 +7,7 @@ endif()
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO abseil/abseil-cpp REPO abseil/abseil-cpp
REF 540e2537b92cd4abfae6ceddfe24304345461f32 REF 540e2537b92cd4abfae6ceddfe24304345461f32
SHA512 3cabab23ad159592562a30531052bb18c66fce75f93f84a6de17a7488b7d6651f645950c1adb8dfbacc651f2bc0db82c316de132baab38e3ef95ea5b5a0eb6d2 SHA512 3cabab23ad159592562a30531052bb18c66fce75f93f84a6de17a7488b7d6651f645950c1adb8dfbacc651f2bc0db82c316de132baab38e3ef95ea5b5a0eb6d2
HEAD_REF master HEAD_REF master
) )
@ -23,14 +23,6 @@ vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-abseil TARGET_PATH share/unofficial-abseil) 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() vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/abseil RENAME copyright) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/abseil RENAME copyright)