diff options
| author | Phoebe <925731795@qq.com> | 2019-05-29 06:32:31 +0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-05-28 15:32:31 -0700 |
| commit | 0ec60d1f9014559103e207b8b85414b3e856f622 (patch) | |
| tree | 6fa47a0e1c79f49f3a3fdf44927ffb012c4cc9f6 | |
| parent | 28d313fb8303248a6626cfc7ce7ced984aceeafb (diff) | |
| download | vcpkg-0ec60d1f9014559103e207b8b85414b3e856f622.tar.gz vcpkg-0ec60d1f9014559103e207b8b85414b3e856f622.zip | |
[Curl] Fix cmake target name (#6649)
* Update patch and portfile
* Fix case issue in curl, related issue #6643
| -rw-r--r-- | ports/curl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/curl/portfile.cmake | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 226ce5b1a..3f5539de7 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Version: 7.65.0 +Version: 7.65.0-1 Build-Depends: zlib Description: A library for transferring data with URLs Default-Features: ssl diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 2a75c696f..294c7a758 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -123,9 +123,9 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # the native CMAKE_EXECUTABLE_SUFFIX does not work in portfiles, so emulate it if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Windows - set(EXECUTABLE_SUFFIX ".exe") + set(EXECUTABLE_SUFFIX ".exe") else() - set(EXECUTABLE_SUFFIX "") + set(EXECUTABLE_SUFFIX "") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/curl${EXECUTABLE_SUFFIX}") @@ -134,9 +134,9 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/curl${EXECUTABLE_SUFFIX}") vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/curl) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(READ "${CURRENT_PACKAGES_DIR}/share/curl/curl-target-release.cmake" RELEASE_MODULE) + file(READ "${CURRENT_PACKAGES_DIR}/share/curl/CURLTargets-release.cmake" RELEASE_MODULE) string(REPLACE "\${_IMPORT_PREFIX}/bin/curl${EXECUTABLE_SUFFIX}" "\${_IMPORT_PREFIX}/tools/curl/curl${EXECUTABLE_SUFFIX}" RELEASE_MODULE "${RELEASE_MODULE}") - file(WRITE "${CURRENT_PACKAGES_DIR}/share/curl/curl-target-release.cmake" "${RELEASE_MODULE}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/curl/CURLTargets-release.cmake" "${RELEASE_MODULE}") endif() endif() |