diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-12-05 14:57:14 +0100 |
|---|---|---|
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-12-07 21:29:25 +0100 |
| commit | d64fd32046936eccccfb5b15dd7e8bfafd01f247 (patch) | |
| tree | be788cd83a23dda5bc6e355e5fba6abb6a380bd4 /ports/curl/0001_cmake.patch | |
| parent | 216f7137b9736d68e698f32154966ea68c7b98db (diff) | |
| download | vcpkg-d64fd32046936eccccfb5b15dd7e8bfafd01f247.tar.gz vcpkg-d64fd32046936eccccfb5b15dd7e8bfafd01f247.zip | |
curl: update to v7.57.0
Due to changes in curl's CMake support, where it now installs .cmake
files, we now have to make sure that they are installed into the correct
directory (and not duplicated into the debug/share/ directory, either).
Also, a change in the context of the 2nd patch required an update of
said patch.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Diffstat (limited to 'ports/curl/0001_cmake.patch')
| -rw-r--r-- | ports/curl/0001_cmake.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/ports/curl/0001_cmake.patch b/ports/curl/0001_cmake.patch index db281e122..4298321b3 100644 --- a/ports/curl/0001_cmake.patch +++ b/ports/curl/0001_cmake.patch @@ -11,3 +11,18 @@ index 12a7c61..9839c67 100644 ) if(LIBSSH2_INCLUDE_DIR) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7b73b98..6c7c559 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1132,7 +1132,9 @@ function(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE) + + endfunction() + +-if(WIN32 AND NOT CYGWIN) ++if(MSVC) ++ set(CURL_INSTALL_CMAKE_DIR share/curl) ++elseif(WIN32 AND NOT CYGWIN) + set(CURL_INSTALL_CMAKE_DIR CMake) + else() + set(CURL_INSTALL_CMAKE_DIR lib/cmake/curl) |