Merge pull request #924 from a17r/0.27-use-libssh-config

piponazo · web-flow · commit 4061111aca26 · 2019-06-24T09:55:58.000+02:00
0.27: use libssh-config instead of custom FindSSH.cmake
diff --git a/cmake/FindSSH.cmake b/cmake/FindSSH.cmake
diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
@@ -20,7 +20,7 @@ if( EXIV2_ENABLE_WEBREADY )
     endif()
 
     if( EXIV2_ENABLE_SSH )
-        find_package( SSH REQUIRED)
+        find_package(libssh CONFIG REQUIRED)
     endif( )
 endif( )
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -174,8 +174,8 @@ target_include_directories(exiv2lib_int PUBLIC
 if (EXIV2_ENABLE_WEBREADY)
 
     if( EXIV2_ENABLE_SSH )
-        target_include_directories(exiv2lib SYSTEM PUBLIC ${SSH_INCLUDE_DIR} )
-        target_link_libraries( exiv2lib PUBLIC ${SSH_LIBRARIES})
+        target_include_directories(exiv2lib SYSTEM PUBLIC ${LIBSSH_INCLUDE_DIR})
+        target_link_libraries(exiv2lib PUBLIC ${LIBSSH_LIBRARIES})
     endif()
 
     if( EXIV2_ENABLE_CURL )
