Skip to content

[CURL] Remove unnecessary renaming. #6386

Merged
cbezault merged 8 commits intomicrosoft:masterfrom
Neumann-A:patch-5
May 13, 2019
Merged

[CURL] Remove unnecessary renaming. #6386
cbezault merged 8 commits intomicrosoft:masterfrom
Neumann-A:patch-5

Conversation

@Neumann-A
Copy link
Contributor

CMake updated the FindCURL module and the renaming is no longer required.

From FindCURL.cmake in CMake:

  find_library(CURL_LIBRARY_RELEASE NAMES
      curl
    # Windows MSVC prebuilts:
      curllib
      libcurl_imp
      curllib_static
    # Windows older "Win32 - MSVC" prebuilts (libcurl.lib, e.g. libcurl-7.15.5-win32-msvc.zip):
      libcurl
      HINTS ${PC_CURL_LIBRARY_DIRS}
  )
  mark_as_advanced(CURL_LIBRARY_RELEASE)

  find_library(CURL_LIBRARY_DEBUG NAMES
    # Windows MSVC CMake builds in debug configuration on vcpkg:
      libcurl-d_imp
      libcurl-d
      HINTS ${PC_CURL_LIBRARY_DIRS}
  )
  mark_as_advanced(CURL_LIBRARY_DEBU

@Neumann-A
Copy link
Contributor Author

regressions? probably a few ports which come with there own FindCURL module which can simply be removed.

@NancyLi1013
Copy link
Contributor

Hi @Neumann-A, thanks for your PR. Here are some regressions from the current CI system:

x64-windows master test notes
libideviceactivation Pass Fail Regression
gdal Pass Fail Regression
idevicerestore Pass Fail Regression
x64-windows-static master test notes
curl Pass Fail Regression
x64-osx master test notes
curl Pass Fail Regression
x86-windows master test notes
libideviceactivation Pass Fail Regression
gdal Pass Fail Regression
idevicerestore Pass Fail Regression
x64-linux master test notes
curl Pass Fail Regression

failureLogs.zip

Neumann-A and others added 5 commits May 11, 2019 12:02
CMake updated its module file for FindCURL. so the renaming is not required anymore.
@cbezault cbezault merged commit 0413c73 into microsoft:master May 13, 2019
@Neumann-A Neumann-A deleted the patch-5 branch May 13, 2019 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants