This is an automated email from the ASF dual-hosted git repository. qianzhang pushed a commit to branch 1.7.x in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 9abc873d2928119e44234ad57549d8aa0b4d5f14 Author: Liangyu Zhao <[email protected]> AuthorDate: Tue Aug 28 13:30:42 2018 -0700 Windows: Update curl version to 7.61.0. A bug is encountered in version 7.57.0, and is fixed in 7.61.0. Review: https://reviews.apache.org/r/68450/ --- 3rdparty/CMakeLists.txt | 4 ++-- 3rdparty/cmake/Versions.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 23ba58f..e65f8dc 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -743,7 +743,7 @@ if (WIN32) set_target_properties( curl PROPERTIES - IMPORTED_LOCATION_DEBUG ${CURL_ROOT}-build/src/Debug/curl-d.exe + IMPORTED_LOCATION_DEBUG ${CURL_ROOT}-build/src/Debug/curl.exe IMPORTED_LOCATION_RELEASE ${CURL_ROOT}-build/src/Release/curl.exe) else () # This is for single-configuration generators such as Ninja. @@ -758,7 +758,7 @@ if (WIN32) set_target_properties( curl PROPERTIES - IMPORTED_LOCATION ${CURL_ROOT}-build/src/curl${CURL_SUFFIX}.exe) + IMPORTED_LOCATION ${CURL_ROOT}-build/src/curl.exe) endif () MAKE_INCLUDE_DIR(libcurl) diff --git a/3rdparty/cmake/Versions.cmake b/3rdparty/cmake/Versions.cmake index a1c8184..69fc594 100644 --- a/3rdparty/cmake/Versions.cmake +++ b/3rdparty/cmake/Versions.cmake @@ -4,8 +4,8 @@ set(CONCURRENTQUEUE_VERSION "7b69a8f") set(CONCURRENTQUEUE_HASH "SHA256=B2741A1FB2172C2A829503A85D5EE7548BE7ED04236A3FD1EFD2B6088E065CB7") set(CSI_VERSION "0.2.0") set(CSI_HASH "SHA256=CB75FC99B03F3C7C30E407AE86BA63EB069AE4A167A26C94FE97F09CB7FF8771") -set(CURL_VERSION "7.57.0") -set(CURL_HASH "SHA256=7CE35F207562674E71DBADA6891B37E3F043C1E7A82915CB9C2A17AD3A9D659B") +set(CURL_VERSION "7.61.0") +set(CURL_HASH "SHA256=64141F0DB4945268A21B490D58806B97C615D3D0C75BF8C335BBE0EFD13B45B5") set(ELFIO_VERSION "3.2") set(ELFIO_HASH "SHA256=964BE1D401F98FA7A1242BCF048DF32B7D56DBAAAE5D02834900499073AC2E95") set(GOOGLETEST_VERSION "1.8.0")
