diff options
| -rw-r--r-- | cmake/FindFREERDP.cmake | 2 | ||||
| -rw-r--r-- | cmake/FindFREERDP3.cmake | 2 | ||||
| -rw-r--r-- | plugins/CMakeLists.txt | 75 |
3 files changed, 39 insertions, 40 deletions
diff --git a/cmake/FindFREERDP.cmake b/cmake/FindFREERDP.cmake index b8daf95a0..610c398e1 100644 --- a/cmake/FindFREERDP.cmake +++ b/cmake/FindFREERDP.cmake @@ -19,7 +19,7 @@ find_package(PkgConfig) if(PKG_CONFIG_FOUND) - pkg_check_modules(PC_FREERDP freerdp2>=${FREERDP_REQUIRED_VERSIONSTRING}) + pkg_check_modules(PC_FREERDP freerdp2>=2.0.0) endif() set(FREERDP_DEFINITIONS ${PC_FREERDP_CFLAGS_OTHER}) diff --git a/cmake/FindFREERDP3.cmake b/cmake/FindFREERDP3.cmake index 05d86c1c4..613552a90 100644 --- a/cmake/FindFREERDP3.cmake +++ b/cmake/FindFREERDP3.cmake @@ -19,7 +19,7 @@ find_package(PkgConfig) if(PKG_CONFIG_FOUND) - pkg_check_modules(PC_FREERDP3 freerdp3>=${FREERDP_REQUIRED_VERSIONSTRING}) + pkg_check_modules(PC_FREERDP3 freerdp3>=3.0.0}) endif() set(FREERDP3_DEFINITIONS ${PC_FREERDP3_CFLAGS_OTHER}) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index d08aa670d..96a377668 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -44,15 +44,15 @@ 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() find_required_package(XKBFILE) if(LIBSSH_FOUND AND XKBFILE_FOUND) - add_subdirectory(nx) + add_subdirectory(nx) endif() add_subdirectory(xdmcp) @@ -61,21 +61,20 @@ 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}) -option(WITH_FREERDP3 "Building RDP with FREERDP 3" OFF) -if(WITH_FREERDP3) + ${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) - find_suggested_package(FREERDP3) - if(FREERDP3_FOUND) - set(FREERDP_FOUND FREERDP3_FOUND) - endif() -else() - find_suggested_package(FREERDP) -endif() -if(FREERDP_FOUND) - add_subdirectory(rdp) + set(FREERDP_FOUND FREERDP3_FOUND) + add_subdirectory(rdp) +elseif(FREERDP_FOUND) + add_subdirectory(rdp) endif() + #find_suggested_package(TELEPATHY) #if(TELEPATHY_FOUND) #add_subdirectory(telepathy) @@ -83,44 +82,44 @@ endif() find_suggested_package(LIBVNCSERVER) if(LIBVNCSERVER_FOUND) - add_subdirectory(vnc) + add_subdirectory(vnc) 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(WEBKIT2_FOUND) + message(WARNING "WEBKIT not found") + endif(WEBKIT2_FOUND) 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) add_subdirectory(st) CheckHasModule(KF5Wallet) if(HAS_MODULE_KF5Wallet) - message(STATUS "Enabling KDE Wallet plugin.") - add_definitions(-DWITH_KF5WALLET) - add_subdirectory(kwallet) + message(STATUS "Enabling KDE Wallet plugin.") + add_definitions(-DWITH_KF5WALLET) + add_subdirectory(kwallet) endif() |