diff options
| author | Dico <Dico200@users.noreply.github.com> | 2020-08-07 20:13:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-07 11:13:09 -0700 |
| commit | cfe88ab476168dc45ae3384eafeccadb7848f517 (patch) | |
| tree | d47f10b7b46801739ff50254e965f4d0490c82a1 | |
| parent | 7c1e5863c0e8a67fc6c151f160bca213ac088d66 (diff) | |
| download | vcpkg-cfe88ab476168dc45ae3384eafeccadb7848f517.tar.gz vcpkg-cfe88ab476168dc45ae3384eafeccadb7848f517.zip | |
[abseil] Fix CMake warning (#12781)
* abseil: Patch to fix CMake Threads dependency warning.
* abseil: Make portfile comment more concise
| -rw-r--r-- | ports/abseil/fix-cmake-threads-dependency.patch | 13 | ||||
| -rw-r--r-- | ports/abseil/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/abseil/vcpkg.json | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/ports/abseil/fix-cmake-threads-dependency.patch b/ports/abseil/fix-cmake-threads-dependency.patch new file mode 100644 index 000000000..0dda75e36 --- /dev/null +++ b/ports/abseil/fix-cmake-threads-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/CMake/abslConfig.cmake.in b/CMake/abslConfig.cmake.in +index 60847fa77..6d23f63d3 100644 +--- a/CMake/abslConfig.cmake.in ++++ b/CMake/abslConfig.cmake.in +@@ -1,6 +1,7 @@ + # absl CMake configuration file. + +-include(FindThreads) ++include(CMakeFindDependencyMacro) ++find_dependency(Threads) + + @PACKAGE_INIT@ + diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index 8fcf0bb76..0b62c6c2e 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -7,9 +7,12 @@ set(ABSEIL_PATCHES # This patch is an upstream commit, the related PR: https://github.com/abseil/abseil-cpp/pull/637
fix-MSVCbuildfail.patch
-
+
# Remove this patch in next update, see https://github.com/google/cctz/pull/145
fix-arm-build.patch
+
+ # This patch is an upstream commit: https://github.com/abseil/abseil-cpp/commit/68494aae959dfbbf781cdf03a988d2f5fc7e4802
+ fix-cmake-threads-dependency.patch
)
if("cxx17" IN_LIST FEATURES)
diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index 4d4db866b..79e6c308b 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,7 +1,7 @@ { "name": "abseil", "version-string": "2020-03-03", - "port-version": 7, + "port-version": 8, "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.", |