diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2019-12-23 15:44:37 -0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2019-12-23 15:44:37 -0800 |
| commit | 6723668f7f2eaec5a93a1e43e510358204556e8c (patch) | |
| tree | 232f3418be7035698b9d3a9852327ddd61d65223 /ports/abseil/fix-config.patch | |
| parent | 2ee03bab9f864cedbae44a1c8f68de5c358f7065 (diff) | |
| download | vcpkg-6723668f7f2eaec5a93a1e43e510358204556e8c.tar.gz vcpkg-6723668f7f2eaec5a93a1e43e510358204556e8c.zip | |
[abseil] Update to the latest and fix link failure error using StrCat (#9367)
* [abseil] Update to the latest and fix link failure for StrCat with > 4 arguments
* Remove message from vcpkg_fail_port_install
* Update lnk2019-error patch
Diffstat (limited to 'ports/abseil/fix-config.patch')
| -rw-r--r-- | ports/abseil/fix-config.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/ports/abseil/fix-config.patch b/ports/abseil/fix-config.patch deleted file mode 100644 index daa5dd3a4..000000000 --- a/ports/abseil/fix-config.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMake/abslConfig.cmake.in b/CMake/abslConfig.cmake.in
-index 60847fa..4641d44 100644
---- a/CMake/abslConfig.cmake.in
-+++ b/CMake/abslConfig.cmake.in
-@@ -4,4 +4,8 @@ include(FindThreads)
-
- @PACKAGE_INIT@
-
-+include(CMakeFindDependencyMacro)
-+
-+set_and_check(absl_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
-+
- include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
-\ No newline at end of file
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e7587f7..3079534 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -132,6 +132,7 @@ if(ABSL_ENABLE_INSTALL)
- CMake/abslConfig.cmake.in
- "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
- INSTALL_DESTINATION "${ABSL_INSTALL_CONFIGDIR}"
-+ PATH_VARS CMAKE_INSTALL_INCLUDEDIR
- )
- install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
- DESTINATION "${ABSL_INSTALL_CONFIGDIR}"
|