diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-10 08:06:20 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-11-10 08:06:20 -0800 |
| commit | 3ae740cef8e34ebb447752b3e0c628dc39553315 (patch) | |
| tree | 62f88f32be80ffa6c966d40d6619780f98eb30b2 | |
| parent | 318613d2b230a306fb0c09ed1727cd66aeb60434 (diff) | |
| download | vcpkg-3ae740cef8e34ebb447752b3e0c628dc39553315.tar.gz vcpkg-3ae740cef8e34ebb447752b3e0c628dc39553315.zip | |
[abseil] Update, apply workaround for NOMINMAX
| -rw-r--r-- | ports/abseil/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ports/abseil/CONTROL | 2 | ||||
| -rw-r--r-- | ports/abseil/portfile.cmake | 12 |
3 files changed, 13 insertions, 5 deletions
diff --git a/ports/abseil/CMakeLists.txt b/ports/abseil/CMakeLists.txt index 4a96b3fde..de9ce8c52 100644 --- a/ports/abseil/CMakeLists.txt +++ b/ports/abseil/CMakeLists.txt @@ -14,7 +14,7 @@ endif() function(add_sublibrary LIB) file(GLOB_RECURSE SOURCES "absl/${LIB}/*.cc") - list(FILTER SOURCES EXCLUDE REGEX "_test(_.+)?.cc$|_nonprod.cc$") + list(FILTER SOURCES EXCLUDE REGEX "_test(ing)?(_.+)?.cc$|_nonprod.cc$") file(GLOB HEADERS "absl/${LIB}/*.h") file(GLOB INTERNAL_HEADERS "absl/${LIB}/internal/*.h") @@ -83,7 +83,7 @@ target_link_public_libraries(time base numeric) target_link_public_libraries(synchronization base time) find_package(unofficial-cctz REQUIRED) -targeT_link_libraries(time PUBLIC unofficial::cctz) +target_link_libraries(time PUBLIC unofficial::cctz) install( EXPORT unofficial-abseil-targets diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index 44684b6b8..2e0345619 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -1,5 +1,5 @@ Source: abseil
-Version: 2017-10-14
+Version: 2017-11-10
Description: an open-source collection designed to augment the C++ standard library.
Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.
In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.
diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index d74369951..a6efa08b5 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -10,8 +10,8 @@ message("To use from cmake:\n find_package(unofficial-abseil REQUIRED)\n link_ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO abseil/abseil-cpp
- REF 1a9ba5e2e5a14413704f0c913fac53359576d3b6
- SHA512 756e494c30324c937ca655d91afdee9acb923c7ee837a7c685441305bea2d54a75b3b21be7355abe416660984ba51ace9d234d70168fb029c601b7442397e8ff
+ REF 778abb7c279547afe7a4642063712f13a80b8eea
+ SHA512 55268321429ac5dfc432fd60e71cfac5abbc4b7145bc16bfaaff9dd05af4a3a8cb92e95906f6ebcd493f71e2fd892ddc8923011ad15fbd37ed423b70200c8538
HEAD_REF master
)
@@ -27,6 +27,14 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-abseil)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/abseil ${CURRENT_PACKAGES_DIR}/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)
|