diff options
| author | Hiroyuki Tanaka <myheroyuki@outlook.com> | 2024-01-17 17:42:21 +0300 |
|---|---|---|
| committer | Hiroyuki Tanaka <myheroyuki@outlook.com> | 2024-01-17 17:42:21 +0300 |
| commit | f9a0c5c8ab5503761950e2223b125bc6825b7ee8 (patch) | |
| tree | 442009ebfe72acdeb93012f8698558fd388028d0 | |
| parent | bfe864332837e63eb70ca6b2a23f97da2d5c9421 (diff) | |
| parent | 1c95ab965a2dda8c13a0bb1f9bf4675e63166b01 (diff) | |
Merge branch 'freerdp_optional' into 'master'
Allow Remmina to be built without FreeRDP
See merge request Remmina/Remmina!2558
| -rw-r--r-- | plugins/CMakeLists.txt | 25 | ||||
| -rw-r--r-- | plugins/rdp/CMakeLists.txt | 17 |
2 files changed, 24 insertions, 18 deletions
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 70404a2dd..acb93e027 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -49,7 +49,30 @@ if(LIBSSH_FOUND) target_link_libraries(remmina ${SSH_LIBRARIES}) endif() -add_subdirectory(rdp) +option(WITH_FREERDP3 "Compile the RDP plugin using symbols from FreeRDP3" OFF) +if (WITH_FREERDP3) + set(FREERDP_REQUIRED_VERSION 3) + set(FREERDP_REQUIRED_MAJOR 3) + set(FREERDP_REQUIRED_MINOR 0) + set(FREERDP_REQUIRED_REVISION 0) +else() + set(FREERDP_REQUIRED_VERSION 2) + set(FREERDP_REQUIRED_MAJOR 2) + set(FREERDP_REQUIRED_MINOR 0) + set(FREERDP_REQUIRED_REVISION 0) +endif() + +find_package(WinPR ${FREERDP_REQUIRED_VERSION} ) +find_package(FreeRDP ${FREERDP_REQUIRED_VERSION} ) +find_package(FreeRDP-Client ${FREERDP_REQUIRED_VERSION} ) + + +if (WinPR_FOUND AND FreeRDP_FOUND AND FreeRDP-Client_FOUND) + message("Enabling RDP plugin") + add_subdirectory(rdp) +else() + message(STATUS "Disabling RDP plugin.") +endif() # X2Go option(WITH_X2GO "Build X2Go plugin" OFF) diff --git a/plugins/rdp/CMakeLists.txt b/plugins/rdp/CMakeLists.txt index 377b42500..da4798b1d 100644 --- a/plugins/rdp/CMakeLists.txt +++ b/plugins/rdp/CMakeLists.txt @@ -36,23 +36,6 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) find_package(Threads REQUIRED) -option(WITH_FREERDP3 "Compile the RDP plugin using symbols from FreeRDP3" OFF) -if (WITH_FREERDP3) - set(FREERDP_REQUIRED_VERSION 3) - set(FREERDP_REQUIRED_MAJOR 3) - set(FREERDP_REQUIRED_MINOR 0) - set(FREERDP_REQUIRED_REVISION 0) -else() - set(FREERDP_REQUIRED_VERSION 2) - set(FREERDP_REQUIRED_MAJOR 2) - set(FREERDP_REQUIRED_MINOR 0) - set(FREERDP_REQUIRED_REVISION 0) -endif() - -find_package(WinPR ${FREERDP_REQUIRED_VERSION} REQUIRED) -find_package(FreeRDP ${FREERDP_REQUIRED_VERSION} REQUIRED) -find_package(FreeRDP-Client ${FREERDP_REQUIRED_VERSION} REQUIRED) - find_suggested_package(Cups) set(REMMINA_PLUGIN_RDP_SRCS |