diff options
| author | Force Charlie <charlieio@outlook.com> | 2018-09-05 22:13:31 +0800 |
|---|---|---|
| committer | Force Charlie <charlieio@outlook.com> | 2018-09-05 22:13:31 +0800 |
| commit | 03204d0c7016574015d47d82e0bbc92120e8ab79 (patch) | |
| tree | 1c58fe1bae85edd767435b4d5754e9df00c6b0d0 /ports/curl | |
| parent | a91bc989a12ce8254f2315100d5615d84cbe9099 (diff) | |
| download | vcpkg-03204d0c7016574015d47d82e0bbc92120e8ab79.tar.gz vcpkg-03204d0c7016574015d47d82e0bbc92120e8ab79.zip | |
[ports] fix curl 001 patch, update nghttp2 to 1.33.0
Diffstat (limited to 'ports/curl')
| -rw-r--r-- | ports/curl/0001_cmake.patch | 20 | ||||
| -rw-r--r-- | ports/curl/0004_nghttp2_staticlib.patch | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/ports/curl/0001_cmake.patch b/ports/curl/0001_cmake.patch index 4298321b3..7796af413 100644 --- a/ports/curl/0001_cmake.patch +++ b/ports/curl/0001_cmake.patch @@ -1,28 +1,28 @@ diff --git a/CMake/FindLibSSH2.cmake b/CMake/FindLibSSH2.cmake -index 12a7c61..9839c67 100644 +index 84822dba7..0d6219425 100644 --- a/CMake/FindLibSSH2.cmake +++ b/CMake/FindLibSSH2.cmake -@@ -12,7 +12,7 @@ endif (LIBSSH2_INCLUDE_DIR AND LIBSSH2_LIBRARY) - FIND_PATH(LIBSSH2_INCLUDE_DIR libssh2.h +@@ -12,7 +12,7 @@ endif() + find_path(LIBSSH2_INCLUDE_DIR libssh2.h ) --FIND_LIBRARY(LIBSSH2_LIBRARY NAMES ssh2 -+FIND_LIBRARY(LIBSSH2_LIBRARY NAMES ssh2 libssh2 +-find_library(LIBSSH2_LIBRARY NAMES ssh2 ++find_library(LIBSSH2_LIBRARY NAMES ssh2 libssh2 ) if(LIBSSH2_INCLUDE_DIR) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7b73b98..6c7c559 100644 +index e6dbb73f1..1e2ff138e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1132,7 +1132,9 @@ function(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE) +@@ -1144,7 +1144,9 @@ function(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE) endfunction() -if(WIN32 AND NOT CYGWIN) +if(MSVC) -+ set(CURL_INSTALL_CMAKE_DIR share/curl) ++ set(CURL_INSTALL_CMAKE_DIR share/curl) +elseif(WIN32 AND NOT CYGWIN) - set(CURL_INSTALL_CMAKE_DIR CMake) + set(CURL_INSTALL_CMAKE_DIR CMake) else() - set(CURL_INSTALL_CMAKE_DIR lib/cmake/curl) + set(CURL_INSTALL_CMAKE_DIR lib/cmake/curl) diff --git a/ports/curl/0004_nghttp2_staticlib.patch b/ports/curl/0004_nghttp2_staticlib.patch index c5cba9c5f..69c1854f9 100644 --- a/ports/curl/0004_nghttp2_staticlib.patch +++ b/ports/curl/0004_nghttp2_staticlib.patch @@ -6,7 +6,7 @@ index 490cc19..51c0a92 100644 find_package(NGHTTP2 REQUIRED) include_directories(${NGHTTP2_INCLUDE_DIRS}) list(APPEND CURL_LIBS ${NGHTTP2_LIBRARIES}) -+ if(CURL_STATICLIB) ++ if(NOT BUILD_SHARED_LIBS) + add_definitions(-DNGHTTP2_STATICLIB) + endif() endif() |