NO binary check at compile timeflatpak/x2go

1 files changed, 47 insertions, 55 deletions

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 5627a31a3..93b98c23f 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -44,49 +44,41 @@ set(REMMINA_COMMON_LIBRARIES ${GTK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 
 find_suggested_package(LIBSSH)
 if(LIBSSH_FOUND)
-	add_definitions(-DHAVE_LIBSSH)
-	include_directories(${SSH_INCLUDE_DIRS})
-	target_link_libraries(remmina ${SSH_LIBRARIES})
+    add_definitions(-DHAVE_LIBSSH)
+    include_directories(${SSH_INCLUDE_DIRS})
+    target_link_libraries(remmina ${SSH_LIBRARIES})
 endif()
 
 set(FREERDP_REQUIRED_MAJOR 2)
 set(FREERDP_REQUIRED_MINOR 0)
 set(FREERDP_REQUIRED_REVISION 0)
 set(FREERDP_REQUIRED_VERSIONSTRING
-	${FREERDP_REQUIRED_MAJOR}.${FREERDP_REQUIRED_MINOR}.${FREERDP_REQUIRED_REVISION})
-find_package (FREERDP3)
-find_package (FREERDP)
+    ${FREERDP_REQUIRED_MAJOR}.${FREERDP_REQUIRED_MINOR}.${FREERDP_REQUIRED_REVISION})
+find_package(FREERDP3)
+find_package(FREERDP)
 if(FREERDP3_FOUND)
-	add_definitions(-DWITH_FREERDP3)
-	option(WITH_FREERDP3 "Building RDP with FREERDP 3" ON)
-	set(FREERDP_REQUIRED_MAJOR 3)
-	set(FREERDP_FOUND FREERDP3_FOUND)
-	add_subdirectory(rdp)
+    add_definitions(-DWITH_FREERDP3)
+    option(WITH_FREERDP3 "Building RDP with FREERDP 3" ON)
+    set(FREERDP_REQUIRED_MAJOR 3)
+    set(FREERDP_FOUND FREERDP3_FOUND)
+    add_subdirectory(rdp)
 elseif(FREERDP_FOUND)
-	add_subdirectory(rdp)
+    add_subdirectory(rdp)
 endif()
 
 # X2Go
 option(WITH_X2GO "Build X2Go plugin" OFF)
 if(WITH_X2GO)
     message(STATUS "Enabling X2Go plugin.")
-
-	find_program(PYHOCA_EXECUTABLE pyhoca-cli)
-
-	# FIXME: pyhoca-cli is a run-time dependency, not relevant at build-time
-	if(PYHOCA_EXECUTABLE)
-		message(STATUS "pyhoca-cli was found. The X2Go plugin will be installed")
-		add_subdirectory(x2go)
-	else()
-		message(WARNING "pyhoca-cli was not found. X2Go plugin won't be built")
-	endif()
+    message(AUTHOR_WARNING "pyhoca-cli is needed at runtime, be sure to install it")
+    add_subdirectory(x2go)
 else()
-	message(STATUS "Disabling X2Go plugin.")
+    message(STATUS "Disabling X2Go plugin.")
 endif()
 
 find_suggested_package(LIBVNCSERVER)
 if(LIBVNCSERVER_FOUND)
-	add_subdirectory(vnc)
+    add_subdirectory(vnc)
 endif()
 
 option(WITH_GVNC "Build GVNC plugin" OFF)
@@ -95,54 +87,54 @@ if(WITH_GVNC)
     add_definitions(-DWITH_GVNC)
     find_suggested_package(GTK-VNC)
     if(GTK-VNC_FOUND)
-            add_subdirectory(gvnc)
+        add_subdirectory(gvnc)
     endif()
 else()
-	message(STATUS "Disabling GVNC plugin.")
+    message(STATUS "Disabling GVNC plugin.")
 endif()
 
 find_suggested_package(Spice)
 if(SPICE_FOUND)
-	add_subdirectory(spice)
+    add_subdirectory(spice)
 endif()
 
 option(WITH_WWW "Build WWW plugin" ON)
 if(WITH_WWW)
-	message(STATUS "Enabling WWW plugin.")
-	add_definitions(-DWITH_WWW)
-	pkg_search_module(WEBKIT2
-		webkit2gtk-4.0
-		webkit2gtk-3.0
-		libwebkit2gtk-4.0
-		libwebkit2gtk-3.0
-		)
-	if(WEBKIT2_FOUND)
-		message(STATUS "WWW plugin dependencies found")
-		add_subdirectory(www)
-	else(WEBKIT2_FOUND)
-		message(WARNING "WEBKIT not found")
-	endif(WEBKIT2_FOUND)
+    message(STATUS "Enabling WWW plugin.")
+    add_definitions(-DWITH_WWW)
+    pkg_search_module(WEBKIT2
+        webkit2gtk-4.0
+        webkit2gtk-3.0
+        libwebkit2gtk-4.0
+        libwebkit2gtk-3.0
+        )
+    if(WEBKIT2_FOUND)
+        message(STATUS "WWW plugin dependencies found")
+        add_subdirectory(www)
+    else()
+        message(WARNING "WEBKIT not found")
+    endif()
 else()
-	message(STATUS "Disabling WWW plugin.")
+    message(STATUS "Disabling WWW plugin.")
 endif()
 
 if(WITH_EXAMPLES)
-	message(STATUS "Enabling examples and test plugins.")
-	add_subdirectory(tool_hello_world)
+    message(STATUS "Enabling examples and test plugins.")
+    add_subdirectory(tool_hello_world)
 endif()
 
 add_subdirectory(exec)
 
 option(WITH_KF5WALLET "Building KF5WALLET plugin" OFF)
 if(WITH_KF5WALLET)
-	CheckHasModule(KF5Wallet)
-	if(HAS_MODULE_KF5Wallet)
-		message(STATUS "Enabling KDE Wallet plugin.")
-		add_definitions(-DWITH_KF5WALLET)
-		add_subdirectory(kwallet)
-	else()
-		message(FATAL_ERROR "libKF5wallet not found but requested")
-	endif()
+    CheckHasModule(KF5Wallet)
+    if(HAS_MODULE_KF5Wallet)
+        message(STATUS "Enabling KDE Wallet plugin.")
+        add_definitions(-DWITH_KF5WALLET)
+        add_subdirectory(kwallet)
+    else()
+        message(FATAL_ERROR "libKF5wallet not found but requested")
+    endif()
 endif()
 
 option(WITH_ST "Build Simple Terminal plugin" OFF)
@@ -150,7 +142,7 @@ if(WITH_ST)
     message(STATUS "Enabling ST plugin.")
     add_definitions(-DWITH_ST)
     get_filename_component(_st_fullpath "st" REALPATH)
-    if (EXISTS "${_st_fullpath}" AND EXISTS "${_st_fullpath}/CMakeLists.txt")
+    if(EXISTS "${_st_fullpath}" AND EXISTS "${_st_fullpath}/CMakeLists.txt")
         add_subdirectory(st)
     else()
         message(WARNING "Can't find ${_st_fullpath}/CMakeLists.txt")
@@ -162,7 +154,7 @@ if(WITH_XDMCP)
     add_definitions(-DWITH_XDMCP)
     message(STATUS "Enabling XDMCP plugin.")
     get_filename_component(_xdmcp_fullpath "xdmcp" REALPATH)
-    if (EXISTS "${_xdmcp_fullpath}" AND EXISTS "${_xdmcp_fullpath}/CMakeLists.txt")
+    if(EXISTS "${_xdmcp_fullpath}" AND EXISTS "${_xdmcp_fullpath}/CMakeLists.txt")
         add_subdirectory(xdmcp)
     else()
         message(WARNING "Can't find ${_xdmcp_fullpath}/CMakeLists.txt")
@@ -177,7 +169,7 @@ if(WITH_NX)
     if(LIBSSH_FOUND AND XKBFILE_FOUND)
         message(STATUS "Enabling NX plugin.")
         get_filename_component(_nx_fullpath "nx" REALPATH)
-        if (EXISTS "${_nx_fullpath}" AND EXISTS "${_nx_fullpath}/CMakeLists.txt")
+        if(EXISTS "${_nx_fullpath}" AND EXISTS "${_nx_fullpath}/CMakeLists.txt")
             add_subdirectory(nx)
         else()
             message(WARNING "Can't find ${_nx_fullpath}/CMakeLists.txt")