mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 04:57:52 +08:00
d64fd32046
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>
29 lines
804 B
Diff
29 lines
804 B
Diff
diff --git a/CMake/FindLibSSH2.cmake b/CMake/FindLibSSH2.cmake
|
|
index 12a7c61..9839c67 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
|
|
)
|
|
|
|
-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
|
|
--- 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)
|