cmake: disable libssh (causes GTK2/GTK3 version clash for some reason)

FreeRDP · Nov 26, 2011 · 060000a · 060000a
1 parent 214ffd6
commit 060000a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,7 @@ install_manifest.txt
 
 remmina/remmina
 
+rfbint.h
 remmina/src/remmina
 remmina/desktop/remmina.desktop
 remmina-plugins/libvncserver/rfb/rfbconfig.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -84,11 +84,6 @@ set(REMMINA_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/remmina/plugins")
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
 
-find_suggested_package(SSH)
-if(SSH_FOUND)
-	add_definitions(-DHAVE_LIBSSH)
-endif()
-
 find_suggested_package(PTHREAD)
 if(PTHREAD_FOUND)
 	add_definitions(-DHAVE_PTHREAD)

diff --git a/remmina/CMakeLists.txt b/remmina/CMakeLists.txt
@@ -111,13 +111,6 @@ if(VTE_FOUND)
 	target_link_libraries(remmina ${VTE_LIBRARIES})
 endif()
 
-find_optional_package(SSH)
-if(SSH_FOUND)
-	add_definitions(-DHAVE_LIBSSH)
-	include_directories(${SSH_INCLUDE_DIRS})
-	target_link_libraries(remmina ${SSH_LIBRARIES})
-endif()
-
 find_suggested_package(APPINDICATOR)
 if(APPINDICATOR_FOUND)
 	add_definitions(-DHAVE_LIBAPPINDICATOR)