diff options
| -rw-r--r-- | CMakeLists.txt | 639 | ||||
| -rw-r--r-- | config.h.in | 2 | ||||
| -rw-r--r-- | plugins/vnc/vnc_plugin.c | 6 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 442 |
4 files changed, 551 insertions, 538 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 66e977a3a..42b5d520f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,16 +29,24 @@ # this exception statement from all source files in the program, then also # delete it here. -cmake_minimum_required(VERSION 3.4.0) +cmake_minimum_required(VERSION 3.10.0) + +cmake_policy(SET CMP0048 NEW) + +project( + Remmina + VERSION 1.4.21 + DESCRIPTION "The Gtk Remote Desktop Client" + LANGUAGES C CXX +) list(APPEND CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) -list(APPEND CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/macros) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} + ${CMAKE_SOURCE_DIR}/cmake/macros) set(CMAKE_COLOR_MAKEFILE ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -project(Remmina C CXX) - include(CheckCCompilerFlag) include(CheckIncludeFiles) include(CheckLibraryExists) @@ -54,20 +62,24 @@ include(FindPCRE2) include(GlibCompileResourcesSupport) include(FindIntl) -#--------------------------------------------------------------------- -# Package creation with CMake depends on the value of umask - if permissions -# are such that temporary files are created without permissions needed for -# generated packages, the resulting packages may behave badly when installed. -# In particular, RPM packages may improperly reset permissions on core -# directories such as /usr. +# --------------------------------------------------------------------- +# Package creation with CMake depends on the value of umask - if permissions are +# such that temporary files are created without permissions needed for generated +# packages, the resulting packages may behave badly when installed. In +# particular, RPM packages may improperly reset permissions on core directories +# such as /usr. function(check_umask umask_val status_var) - string(REGEX REPLACE "[^x]" "" umask_x "${umask_val}") - string(REGEX REPLACE "[^r]" "" umask_r "${umask_val}") - string(LENGTH "${umask_r}" UMASK_HAVE_R) - set(${status_var} 0 PARENT_SCOPE) - if(UMASK_HAVE_R AND "${umask_x}" STREQUAL "xxx") - set(${status_var} 1 PARENT_SCOPE) - endif() + string(REGEX REPLACE "[^x]" "" umask_x "${umask_val}") + string(REGEX REPLACE "[^r]" "" umask_r "${umask_val}") + string(LENGTH "${umask_r}" UMASK_HAVE_R) + set(${status_var} + 0 + PARENT_SCOPE) + if(UMASK_HAVE_R AND "${umask_x}" STREQUAL "xxx") + set(${status_var} + 1 + PARENT_SCOPE) + endif() endfunction() find_program(SLEEP_EXEC sleep) @@ -78,176 +90,184 @@ mark_as_advanced(SLEEP_EXEC) find_program(UMASK_EXEC umask) mark_as_advanced(UMASK_EXEC) if(NOT UMASK_EXEC) - # If we don't have a umask cmd, see if sh -c "umask -S" works - execute_process(COMMAND sh -c "umask -S" OUTPUT_VARIABLE umask_out) - # Check if we've got something that looks like a umask output - if("${umask_out}" MATCHES "^u=.*g=.*o=.*") - set(UMASK_EXEC sh) - set(UMASK_EXEC_ARGS -c "umask -S") - endif() + # If we don't have a umask cmd, see if sh -c "umask -S" works + execute_process(COMMAND sh -c "umask -S" OUTPUT_VARIABLE umask_out) + # Check if we've got something that looks like a umask output + if("${umask_out}" MATCHES "^u=.*g=.*o=.*") + set(UMASK_EXEC sh) + set(UMASK_EXEC_ARGS -c "umask -S") + endif() else() - set(UMASK_EXEC_ARGS -S) + set(UMASK_EXEC_ARGS -S) endif() if(UMASK_EXEC) - execute_process(COMMAND ${UMASK_EXEC} ${UMASK_EXEC_ARGS} OUTPUT_VARIABLE umask_curr) - string(STRIP "${umask_curr}" umask_curr) - check_umask("${umask_curr}" UMASK_OK) - if(NOT UMASK_OK) - message(" ") - message(WARNING "umask is set to ${umask_curr} - this setting is not recommended if one of the goals of this build is to generate packages. Use 'umask 022' for improved package behavior.") - if(SLEEP_EXEC) - execute_process(COMMAND ${SLEEP_EXEC} 10) - endif() + execute_process(COMMAND ${UMASK_EXEC} ${UMASK_EXEC_ARGS} + OUTPUT_VARIABLE umask_curr) + string(STRIP "${umask_curr}" umask_curr) + check_umask("${umask_curr}" UMASK_OK) + if(NOT UMASK_OK) + message(" ") + message( + WARNING + "\ + umask is set to ${umask_curr} - this setting is not recommended if one\ + of the goals of this build is to generate packages. Use 'umask 022' \ + for improved package behavior. + ") + if(SLEEP_EXEC) + execute_process(COMMAND ${SLEEP_EXEC} 10) endif() + endif() endif() if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Release") + set(CMAKE_BUILD_TYPE "Release") endif() if(NOT BUILD_SHARED_LIBS) - set(BUILD_SHARED_LIBS ON) + set(BUILD_SHARED_LIBS ON) endif() if(CMAKE_COMPILER_IS_GNUCC) - if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES - "i686") - check_symbol_exists(__x86_64__ "" IS_X86_64) - if(IS_X86_64) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") - else() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=i686") - endif() + if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES + "i686") + check_symbol_exists(__x86_64__ "" IS_X86_64) + if(IS_X86_64) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") else() - if(CMAKE_POSITION_INDEPENDENT_CODE) - if(${CMAKE_VERSION} VERSION_LESS 2.8.9) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") - endif() - endif() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=i686") endif() + else() + if(CMAKE_POSITION_INDEPENDENT_CODE) + if(${CMAKE_VERSION} VERSION_LESS 2.8.9) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") + endif() + endif() + endif() + + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") + if(WITH_SSE2) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2") + endif() + + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + add_definitions(-DDEBUG) + check_c_compiler_flag(-Wunused-result Wunused-result) + if(Wunused-result) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused-result") + endif() + check_c_compiler_flag(-Wunused-but-set-variable Wunused-but-set-variable) + if(Wunused-but-set-variable) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused-but-set-variable") + endif() + check_c_compiler_flag(-Wdeprecated-declarations Wdeprecated-declarations) + if(Wdeprecated-declarations) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wdeprecated-declarations") + endif() - if(WITH_SSE2) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2") + check_c_compiler_flag(-Wimplicit-function-declaration + Wimplicit-function-declaration) + if(Wimplicit-function-declaration) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wimplicit-function-declaration") + endif() + if(NOT OPENBSD) + check_c_compiler_flag(-Wredundant-decls Wredundant-decls) + if(Wredundant-decls) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wredundant-decls") + endif() endif() + endif() - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - add_definitions(-DDEBUG) - check_c_compiler_flag(-Wunused-result Wunused-result) - if(Wunused-result) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused-result") - endif() - check_c_compiler_flag(-Wunused-but-set-variable Wunused-but-set-variable) - if(Wunused-but-set-variable) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused-but-set-variable") - endif() - check_c_compiler_flag(-Wdeprecated-declarations Wdeprecated-declarations) - if(Wdeprecated-declarations) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wdeprecated-declarations") - endif() - - check_c_compiler_flag(-Wimplicit-function-declaration - Wimplicit-function-declaration) - if(Wimplicit-function-declaration) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wimplicit-function-declaration") - endif() - if(NOT OPENBSD) - check_c_compiler_flag(-Wredundant-decls Wredundant-decls) - if(Wredundant-decls) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wredundant-decls") - endif() - endif() + if(CMAKE_BUILD_TYPE STREQUAL "Release") + add_definitions(-DNDEBUG) + check_c_compiler_flag(-Wno-unused-result Wno-unused-result) + if(Wno-unused-result) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-result") + endif() + check_c_compiler_flag(-Wno-unused-but-set-variable + Wno-unused-but-set-variable) + if(Wno-unused-but-set-variable) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable") + endif() + check_c_compiler_flag(-Wno-deprecated-declarations + Wno-deprecated-declarations) + if(Wno-deprecated-declarations) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations") endif() - if(CMAKE_BUILD_TYPE STREQUAL "Release") - add_definitions(-DNDEBUG) - check_c_compiler_flag(-Wno-unused-result Wno-unused-result) - if(Wno-unused-result) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-result") - endif() - check_c_compiler_flag(-Wno-unused-but-set-variable - Wno-unused-but-set-variable) - if(Wno-unused-but-set-variable) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable") - endif() - check_c_compiler_flag(-Wno-deprecated-declarations - Wno-deprecated-declarations) - if(Wno-deprecated-declarations) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations") - endif() - - check_c_compiler_flag(-Wimplicit-function-declaration - Wimplicit-function-declaration) - if(Wimplicit-function-declaration) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wimplicit-function-declaration") - endif() - if(NOT OPENBSD) - check_c_compiler_flag(-Wredundant-decls Wredundant-decls) - if(Wredundant-decls) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wredundant-decls") - endif() - endif() - else() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g") + check_c_compiler_flag(-Wimplicit-function-declaration + Wimplicit-function-declaration) + if(Wimplicit-function-declaration) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wimplicit-function-declaration") + endif() + if(NOT OPENBSD) + check_c_compiler_flag(-Wredundant-decls Wredundant-decls) + if(Wredundant-decls) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wredundant-decls") + endif() endif() + else() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g") + endif() endif() if((TARGET_ARCH MATCHES "x86|x64") AND (NOT DEFINED WITH_SSE2)) - option(WITH_SSE2 "Enable SSE2 optimization." ON) + option(WITH_SSE2 "Enable SSE2 optimization." ON) else() - option(WITH_SSE2 "Enable SSE2 optimization." OFF) + option(WITH_SSE2 "Enable SSE2 optimization." OFF) endif() if(TARGET_ARCH MATCHES "ARM") - if(NOT DEFINED WITH_NEON) - option(WITH_NEON "Enable NEON optimization." ON) - else() - option(WITH_NEON "Enable NEON optimization." OFF) - endif() + if(NOT DEFINED WITH_NEON) + option(WITH_NEON "Enable NEON optimization." ON) + else() + option(WITH_NEON "Enable NEON optimization." OFF) + endif() else() - if(NOT APPLE) - option(WITH_IPP "Use Intel Performance Primitives." OFF) - endif() + if(NOT APPLE) + option(WITH_IPP "Use Intel Performance Primitives." OFF) + endif() endif() if(${CMAKE_C_COMPILER_ID} STREQUAL "Clang") - if(CMAKE_BUILD_TYPE STREQUAL "Release") - add_definitions(-DNDEBUG) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-macros -Wno-padded") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-c11-extensions -Wno-gnu") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-command-line-argument") - check_c_compiler_flag(-Wno-deprecated-declarations - Wno-deprecated-declarations) - if(Wno-deprecated-declarations) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations") - endif() - else() - add_definitions(-DDEBUG) - # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused-parameter") set(CMAKE_C_FLAGS - # "${CMAKE_C_FLAGS} -Wunused-macros -Wpadded") set(CMAKE_C_FLAGS - # "${CMAKE_C_FLAGS} -Wc11-extensions -Wgnu") set(CMAKE_C_FLAGS - # "${CMAKE_C_FLAGS} -Wunused-command-line-argument") - check_c_compiler_flag(-Wdeprecated-declarations Wdeprecated-declarations) - if(Wdeprecated-declarations) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wdeprecated-declarations") - endif() + if(CMAKE_BUILD_TYPE STREQUAL "Release") + add_definitions(-DNDEBUG) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-macros -Wno-padded") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-c11-extensions -Wno-gnu") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-command-line-argument") + check_c_compiler_flag(-Wno-deprecated-declarations + Wno-deprecated-declarations) + if(Wno-deprecated-declarations) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations") + endif() + else() + add_definitions(-DDEBUG) + # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused-parameter") set(CMAKE_C_FLAGS + # "${CMAKE_C_FLAGS} -Wunused-macros -Wpadded") set(CMAKE_C_FLAGS + # "${CMAKE_C_FLAGS} -Wc11-extensions -Wgnu") set(CMAKE_C_FLAGS + # "${CMAKE_C_FLAGS} -Wunused-command-line-argument") + check_c_compiler_flag(-Wdeprecated-declarations Wdeprecated-declarations) + if(Wdeprecated-declarations) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wdeprecated-declarations") endif() + endif() endif() # Figure out no-undefined flag if(${CMAKE_SYSTEM_NAME} STREQUAL Darwin) - set(NO_UNDEFINED_FLAG "-Wl,-undefined,error") + set(NO_UNDEFINED_FLAG "-Wl,-undefined,error") elseif((${CMAKE_SYSTEM_NAME} STREQUAL Linux) OR MINGW) - set(NO_UNDEFINED_FLAG "-Wl,--no-undefined") + set(NO_UNDEFINED_FLAG "-Wl,--no-undefined") else() - # On OpenBSD this seems to cause problems, so we unset it - set(NO_UNDEFINED_FLAG "") + # On OpenBSD this seems to cause problems, so we unset it + set(NO_UNDEFINED_FLAG "") endif() -set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${NO_UNDEFINED_FLAG}") +set(CMAKE_SHARED_LINKER_FLAGS + "${CMAKE_SHARED_LINKER_FLAGS} ${NO_UNDEFINED_FLAG}") check_include_files(sys/socket.h HAVE_SYS_SOCKET_H) check_include_files(arpa/inet.h HAVE_ARPA_INET_H) @@ -266,30 +286,22 @@ include_directories(src/include) # FreeBSD if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") - set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic") - include_directories(/usr/local/include /usr/include) - link_directories(/usr/local/lib /usr/lib) - set(CMAKE_REQUIRED_INCLUDES /usr/local/include) - set(CMAKE_SHARED_LIBRARY_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX} /usr/local/lib) + set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic") + include_directories(/usr/local/include /usr/include) + link_directories(/usr/local/lib /usr/lib) + set(CMAKE_REQUIRED_INCLUDES /usr/local/include) + set(CMAKE_SHARED_LIBRARY_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX} /usr/local/lib) endif() # Versioning set(WITH_LIBRARY_VERSIONING "ON") -set(REMMINA_VERSION_MAJOR "1") -set(REMMINA_VERSION_MINOR "4") -set(REMMINA_VERSION_REVISION "21") -# set(REMMINA_VERSION_SUFFIX "1") set(REMMINA_VERSION -# "${REMMINA_VERSION_MAJOR}.${REMMINA_VERSION_MINOR}.${REMMINA_VERSION_REVISION}.${REMMINA_VERSION_SUFFIX}") -set(REMMINA_VERSION - "${REMMINA_VERSION_MAJOR}.${REMMINA_VERSION_MINOR}.${REMMINA_VERSION_REVISION}" - ) -message(STATUS "Remmina version: ${REMMINA_VERSION}") +message(STATUS "Remmina version: ${Remmina_VERSION}") include(GetGitRevisionDescription) git_get_exact_tag(REMMINA_GIT_REVISION --tags --always) if(${REMMINA_GIT_REVISION} STREQUAL "n/a") - git_rev_parse(REMMINA_GIT_REVISION --short) + git_rev_parse(REMMINA_GIT_REVISION --short) endif() message(STATUS "Git Revision: ${REMMINA_GIT_REVISION}") @@ -298,257 +310,259 @@ message(STATUS "Git Revision: ${REMMINA_GIT_REVISION}") set(REMMINA_APP_ID "org.remmina.Remmina") if(NOT REMMINA_DATADIR) - set(REMMINA_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}") - if(NOT REMMINA_RUNTIME_DATADIR) - set(REMMINA_RUNTIME_DATADIR "${REMMINA_DATADIR}") - endif() + set(REMMINA_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}") + if(NOT REMMINA_RUNTIME_DATADIR) + set(REMMINA_RUNTIME_DATADIR "${REMMINA_DATADIR}") + endif() endif() if(NOT REMMINA_TERM_CS_DIR) - set(REMMINA_TERM_CS_DIR "${REMMINA_DATADIR}/remmina/theme") + set(REMMINA_TERM_CS_DIR "${REMMINA_DATADIR}/remmina/theme") endif() if(NOT REMMINA_LOCALEDIR) - set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_FULL_LOCALEDIR}") - if(NOT REMMINA_RUNTIME_LOCALEDIR) - set(REMMINA_RUNTIME_LOCALEDIR "${REMMINA_LOCALEDIR}") - endif() + set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_FULL_LOCALEDIR}") + if(NOT REMMINA_RUNTIME_LOCALEDIR) + set(REMMINA_RUNTIME_LOCALEDIR "${REMMINA_LOCALEDIR}") + endif() endif() if(NOT REMMINA_PLUGINDIR) - set(REMMINA_PLUGINDIR "${CMAKE_INSTALL_FULL_LIBDIR}/remmina/plugins") - if(NOT REMMINA_RUNTIME_PLUGINDIR) - set(REMMINA_RUNTIME_PLUGINDIR "${REMMINA_PLUGINDIR}") - endif() + set(REMMINA_PLUGINDIR "${CMAKE_INSTALL_FULL_LIBDIR}/remmina/plugins") + if(NOT REMMINA_RUNTIME_PLUGINDIR) + set(REMMINA_RUNTIME_PLUGINDIR "${REMMINA_PLUGINDIR}") + endif() endif() if(NOT REMMINA_UIDIR) - set(REMMINA_UIDIR "${REMMINA_DATADIR}/remmina/ui") - if(NOT REMMINA_RUNTIME_UIDIR) - set(REMMINA_RUNTIME_UIDIR "${REMMINA_UIDIR}") - endif() + set(REMMINA_UIDIR "${REMMINA_DATADIR}/remmina/ui") + if(NOT REMMINA_RUNTIME_UIDIR) + set(REMMINA_RUNTIME_UIDIR "${REMMINA_UIDIR}") + endif() endif() if(NOT REMMINA_THEMEDIR) - set(REMMINA_THEMEDIR "${REMMINA_DATADIR}/remmina/theme") - if(NOT REMMINA_RUNTIME_THEMEDIR) - set(REMMINA_RUNTIME_THEMEDIR "${REMMINA_THEMEDIR}") - endif() + set(REMMINA_THEMEDIR "${REMMINA_DATADIR}/remmina/theme") + if(NOT REMMINA_RUNTIME_THEMEDIR) + set(REMMINA_RUNTIME_THEMEDIR "${REMMINA_THEMEDIR}") + endif() endif() if(NOT REMMINA_RESDIR) - set(REMMINA_RESDIR "${REMMINA_DATADIR}/remmina/res") - if(NOT REMMINA_RUNTIME_RESDIR) - set(REMMINA_RUNTIME_RESDIR "${REMMINA_RESDIR}") - endif() + set(REMMINA_RESDIR "${REMMINA_DATADIR}/remmina/res") + if(NOT REMMINA_RUNTIME_RESDIR) + set(REMMINA_RUNTIME_RESDIR "${REMMINA_RESDIR}") + endif() endif() if(NOT REMMINA_EXTERNAL_TOOLS_DIR) - set(REMMINA_EXTERNAL_TOOLS_DIR "${REMMINA_DATADIR}/remmina/external_tools") - if(NOT REMMINA_RUNTIME_EXTERNAL_TOOLS_DIR) - set(REMMINA_RUNTIME_EXTERNAL_TOOLS_DIR "${REMMINA_EXTERNAL_TOOLS_DIR}") - endif() + set(REMMINA_EXTERNAL_TOOLS_DIR "${REMMINA_DATADIR}/remmina/external_tools") + if(NOT REMMINA_RUNTIME_EXTERNAL_TOOLS_DIR) + set(REMMINA_RUNTIME_EXTERNAL_TOOLS_DIR "${REMMINA_EXTERNAL_TOOLS_DIR}") + endif() endif() option(SNAP_BUILD_ONLY "SNAP_BUILD_ONLY" OFF) if(SNAP_BUILD_ONLY) - if(NOT SNAPCRAFT) - message( - FATAL_ERROR "snapcraft not found, impossible to create only snap target") - endif() - return() + if(NOT SNAPCRAFT) + message( + FATAL_ERROR "snapcraft not found, impossible to create only snap target") + endif() + return() endif() if(SNAP_BUILD) - add_definitions(-DSNAP_BUILD) + add_definitions(-DSNAP_BUILD) endif() # Uninstall support -# setup a 'make uninstall' target if we find a -# cmake_uninstall.cmake.in in the module path -#=========================================================== -foreach( MODULE_PATH ${CMAKE_MODULE_PATH} ) - set( UNINSTALL_IN "${MODULE_PATH}/cmake_uninstall.cmake.in" ) - set( UNINSTALL_OUT "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" ) - if( EXISTS ${UNINSTALL_IN} ) - configure_file("${UNINSTALL_IN}" - "${UNINSTALL_OUT}" - IMMEDIATE @ONLY - ) - if(WITH_CLEANUP) - message(STATUS "Remove folders during uninstall target") - add_definitions(-DREMOVE_DIRS) - set(UNINST_RMDIRS 1) - else() - message(STATUS "Folders won't be removed during uninstall target") - set(UNINST_RMDIRS 0) - endif() - add_custom_target(uninstall - "${CMAKE_COMMAND}" -DWITH_CLEANUP:BOOL=${WITH_CLEANUP} -P "${UNINSTALL_OUT}") - option(WITH_CLEANUP "Remove folders during uninstall target" OFF) - break() +# setup a 'make uninstall' target if we find a cmake_uninstall.cmake.in in the +# module path +# =========================================================== +foreach(module_path ${CMAKE_MODULE_PATH}) + set(UNINSTALL_in "${module_path}/cmake_uninstall.cmake.in") + set(UNINSTALL_out "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") + if(EXISTS ${UNINSTALL_in}) + configure_file("${UNINSTALL_in}" "${UNINSTALL_out}" IMMEDIATE @ONLY) + if(WITH_CLEANUP) + message(STATUS "Remove folders during uninstall target") + add_definitions(-DREMOVE_DIRS) + set(UNINST_RMDIRS 1) + else() + message(STATUS "Folders won't be removed during uninstall target") + set(UNINST_RMDIRS 0) endif() + add_custom_target( + uninstall + "${CMAKE_COMMAND}" -DWITH_CLEANUP:BOOL=${WITH_CLEANUP} -P + "${UNINSTALL_out}" + COMMENT "Uninstall target") + option(WITH_CLEANUP "Remove folders during uninstall target" OFF) + break() + endif() endforeach() -#find_required_package(GTK) +# find_required_package(GTK) find_package(GLib REQUIRED) if(NOT GLib_FOUND) - message(FATAL_ERROR "GLIB2 library not found") + message(FATAL_ERROR "GLIB2 library not found") endif() include_directories(${GLib_INCLUDE_DIRS}) include_directories(${GMODULE_INCLUDE_DIR}) find_package(GTK3 3.14.0 REQUIRED) if(NOT GTK3_FOUND) - message(FATAL_ERROR "GTK3 library not found") + message(FATAL_ERROR "GTK3 library not found") endif() include_directories(${GTK3_INCLUDE_DIRS}) pkg_check_modules(wayland-client wayland-client) if(wayland-client_FOUND) - set(GTK_LIBRARIES - ${GTK3_LIBRARY} - ${GDK3_LIBRARY} - ${GDKPixbuf_LIBRARY} - ${Pango_LIBRARY} - ${Cairo_LIBRARY} - ${GObject_LIBRARY} - ${GLib_LIBRARY} - ${GIO_LIBRARY} - ${Gmodule_LIBRARIES} - ${GMODULE_LIBRARY} - ${wayland-client_LIBRARIES} - ) - include_directories(${wayland-client_INCLUDE_DIRS}) - message(STATUS "Wayland library found.") + set(GTK_LIBRARIES + ${GTK3_LIBRARY} + ${GDK3_LIBRARY} + ${GDKPixbuf_LIBRARY} + ${Pango_LIBRARY} + ${Cairo_LIBRARY} + ${GObject_LIBRARY} + ${GLib_LIBRARY} + ${GIO_LIBRARY} + ${Gmodule_LIBRARIES} + ${GMODULE_LIBRARY} + ${wayland-client_LIBRARIES}) + include_directories(${wayland-client_INCLUDE_DIRS}) + message(STATUS "Wayland library found.") else() - set(GTK_LIBRARIES - ${GTK3_LIBRARY} - ${GDK3_LIBRARY} - ${GDKPixbuf_LIBRARY} - ${Pango_LIBRARY} - ${Cairo_LIBRARY} - ${GObject_LIBRARY} - ${GLib_LIBRARY} - ${GIO_LIBRARY} - ${Gmodule_LIBRARIES} - ${GMODULE_LIBRARY} - ) - message(STATUS "Wayland library not found.") + set(GTK_LIBRARIES + ${GTK3_LIBRARY} + ${GDK3_LIBRARY} + ${GDKPixbuf_LIBRARY} + ${Pango_LIBRARY} + ${Cairo_LIBRARY} + ${GObject_LIBRARY} + ${GLib_LIBRARY} + ${GIO_LIBRARY} + ${Gmodule_LIBRARIES} + ${GMODULE_LIBRARY}) + message(STATUS "Wayland library not found.") endif() set(CMAKE_THREAD_PREFER_PTHREAD TRUE) find_package(Threads REQUIRED) if(NOT CMAKE_USE_PTHREADS_INIT) - message(FATAL_ERROR "pthreads thread library not found") + message(FATAL_ERROR "pthreads thread library not found") endif() # Add GCC sanitizer options, must be done after pthreads detection see remmina # issue #1276 if(CMAKE_COMPILER_IS_GNUCC AND WITH_GCC_SANITIZE_ADDRESS) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address") endif() # LLVM coverage flags - https://clang.llvm.org/docs/SourceBasedCodeCoverage.html if("${CMAKE_C_COMPILER_ID}" MATCHES "Clang" AND WITH_CLANG_COVERAGE) - message(STATUS "Enabling coverage.") - add_definitions(-DWITH_CLANG_COVERAGE) - set(CMAKE_C_FLAGS - "${CMAKE_C_FLAGS} -g -fprofile-instr-generate -fcoverage-mapping -ftest-coverage" - ) - set(CMAKE_EXE_LINKER_FLAGS - "${CMAKE_EXE_LINKER_FLAGS} -fprofile-instr-generate") + message(STATUS "Enabling coverage.") + add_definitions(-DWITH_CLANG_COVERAGE) + set(CMAKE_C_FLAGS + "\ + ${CMAKE_C_FLAGS} -g -fprofile-instr-generate \ + -fcoverage-mapping -ftest-coverage\ + ") + set(CMAKE_EXE_LINKER_FLAGS + "${CMAKE_EXE_LINKER_FLAGS} -fprofile-instr-generate") elseif("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" AND WITH_GCC_PROFILING) - message(STATUS "Enabling profiling.") - add_definitions(-DWITH_GCC_PROFILING) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg") + message(STATUS "Enabling profiling.") + add_definitions(-DWITH_GCC_PROFILING) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg") endif() find_suggested_package(GCRYPT) find_package(OpenSSL) find_package(sodium REQUIRED) if(sodium_FOUND) - message(STATUS "sodium_LIBRARY_RELEASE: ${sodium_LIBRARY_RELEASE}") - message(STATUS "sodium_INCLUDE_DIR: ${sodium_INCLUDE_DIR}") - message(STATUS "sodium_LIBRARY_DEBUG: ${sodium_LIBRARY_DEBUG}") + message(STATUS "sodium_LIBRARY_RELEASE: ${sodium_LIBRARY_RELEASE}") + message(STATUS "sodium_INCLUDE_DIR: ${sodium_INCLUDE_DIR}") + message(STATUS "sodium_LIBRARY_DEBUG: ${sodium_LIBRARY_DEBUG}") endif() option(TOGTK4 "Disable deprecations to easy GTK4 migration") if(TOGTK4) - message(STATUS "Do not use GTK3 and GDK deprecated symbols") - add_definitions(-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED) + message(STATUS "Do not use GTK3 and GDK deprecated symbols") + add_definitions(-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED) endif() if(WITH_TRACE_CALLS) - message(STATUS "Enabling trace calls.") - add_definitions(-DWITH_TRACE_CALLS) + message(STATUS "Enabling trace calls.") + add_definitions(-DWITH_TRACE_CALLS) endif() option(WITH_NEWS "Disable online version checking" ON) if(WITH_NEWS) - message(STATUS "Enabling version check connecting to remmina.org") - add_definitions(-DWITH_NEWS) - set(RMNEWS_ENABLE_NEWS 1) + message(STATUS "Enabling version check connecting to remmina.org") + add_definitions(-DWITH_NEWS) + set(RMNEWS_ENABLE_NEWS 1) else() - message(STATUS "Disabling version check connecting to remmina.org") - set(RMNEWS_ENABLE_NEWS 0) + message(STATUS "Disabling version check connecting to remmina.org") + set(RMNEWS_ENABLE_NEWS 0) endif() option(WITH_MANPAGES "Build with MANPAGES" ON) if(WITH_MANPAGES) - message(STATUS "Enabling man pages.") - add_definitions(-DWITH_MANPAGES) + message(STATUS "Enabling man pages.") + add_definitions(-DWITH_MANPAGES) else() - message(STATUS "Man pages disabled") + message(STATUS "Man pages disabled") endif() if(GCRYPT_FOUND) - add_definitions(-DHAVE_LIBGCRYPT) + add_definitions(-DHAVE_LIBGCRYPT) endif() -#avahi for discovery over mDNS/DNS-SD daemon +# avahi for discovery over mDNS/DNS-SD daemon if(UNIX AND NOT APPLE) - find_suggested_package(Avahi) - if(AVAHI_FOUND) - message(STATUS "AVAHI_INCLUDE_DIRS=${AVAHI_INCLUDE_DIRS}") - message(STATUS "AVAHI_LIBRARIES=${AVAHI_LIBRARIES}") - add_definitions(-DHAVE_LIBAVAHI_UI) - add_definitions(-DHAVE_LIBAVAHI_CLIENT) - endif() + find_suggested_package(Avahi) + if(AVAHI_FOUND) + message(STATUS "AVAHI_INCLUDE_DIRS=${AVAHI_INCLUDE_DIRS}") + message(STATUS "AVAHI_LIBRARIES=${AVAHI_LIBRARIES}") + add_definitions(-DHAVE_LIBAVAHI_UI) + add_definitions(-DHAVE_LIBAVAHI_CLIENT) + endif() endif() option(WITH_ICON_CACHE "Generate the icon cache during install target" ON) if(WITH_ICON_CACHE) - message(STATUS "Icon cache will be generated") - add_definitions(-DWITH_ICON_CACHE) - find_program(XDG_ICON_RESOURCE NAMES xdg-icon-resource) - if(XDG_ICON_RESOURCE) - message(STATUS "Theme icon cache will be rebuilt") - add_custom_target(desktop-icon COMMAND ${XDG_ICON_RESOURCE} forceupdate - --theme hicolor) - else() - message(WARNING "Cannot update icon cache: xdg-icon-resource not found") - endif() + message(STATUS "Icon cache will be generated") + add_definitions(-DWITH_ICON_CACHE) + find_program(XDG_ICON_RESOURCE NAMES xdg-icon-resource) + if(XDG_ICON_RESOURCE) + message(STATUS "Theme icon cache will be rebuilt") + add_custom_target( + desktop-icon + COMMAND ${XDG_ICON_RESOURCE} forceupdate --theme hicolor + COMMENT "Updating icon theme") + else() + message(WARNING "Cannot update icon cache: xdg-icon-resource not found") + endif() else() - message(STATUS "Icons cache won't be generated automatically") + message(STATUS "Icons cache won't be generated automatically") endif() option(WITH_UPDATE_DESKTOP_DB - "Generate desktop files MIME types cache database" ON) + "Generate desktop files MIME types cache database" ON) if(WITH_UPDATE_DESKTOP_DB) - message(STATUS "Desktop MIME types cache database enabled") - add_definitions(-DWITH_UPDATE_DESKTOP_DB) + message(STATUS "Desktop MIME types cache database enabled") + add_definitions(-DWITH_UPDATE_DESKTOP_DB) else() - message(STATUS "Desktop MIME types cache database won't be generated") + message(STATUS "Desktop MIME types cache database won't be generated") endif() configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in - ${CMAKE_CURRENT_BINARY_DIR}/generated/config.h) + ${CMAKE_CURRENT_BINARY_DIR}/generated/config.h) set(REMMINA_BUILD_CONFIG_LIST "") get_cmake_property(res VARIABLES) foreach(var ${res}) - if(var MATCHES "^WITH_*|^HAVE_*") - list(APPEND REMMINA_BUILD_CONFIG_LIST "${var}=${${var}}") - endif() + if(var MATCHES "^WITH_*|^HAVE_*") + list(APPEND REMMINA_BUILD_CONFIG_LIST "${var}=${${var}}") + endif() endforeach() string(REPLACE ";" " " REMMINA_BUILD_CONFIG "${REMMINA_BUILD_CONFIG_LIST}") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/buildflags.h.in - ${CMAKE_CURRENT_BINARY_DIR}/generated/buildflags.h) + ${CMAKE_CURRENT_BINARY_DIR}/generated/buildflags.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}/generated/) # Configure RPATH @@ -557,19 +571,18 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(CMAKE_BUILD_RPATH_USE_ORIGIN TRUE) if(NOT FREEBSD) - set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..") + set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..") endif() if(GTK3_FOUND) - #pkg_check_modules(gio REQUIRED gio-2.0) - #pkg_check_modules(gio-unix REQUIRED gio-unix-2.0) - add_subdirectory(src) - add_subdirectory(data) - add_subdirectory(plugins) - add_subdirectory(plugins/secret) + # pkg_check_modules(gio REQUIRED gio-2.0) pkg_check_modules(gio-unix REQUIRED + # gio-unix-2.0) + add_subdirectory(src) + add_subdirectory(data) + add_subdirectory(plugins) + add_subdirectory(plugins/secret) endif() if(WITH_TRANSLATIONS) - add_subdirectory(po) + add_subdirectory(po) endif() - diff --git a/config.h.in b/config.h.in index e59bf78aa..077f1339c 100644 --- a/config.h.in +++ b/config.h.in @@ -14,7 +14,7 @@ #define remmina "remmina" #define REMMINA_APP_ID "${REMMINA_APP_ID}" -#define VERSION "${REMMINA_VERSION}" +#define VERSION "${Remmina_VERSION}" #define REMMINA_GIT_REVISION "${REMMINA_GIT_REVISION}" #define RMNEWS_ENABLE_NEWS ${RMNEWS_ENABLE_NEWS} diff --git a/plugins/vnc/vnc_plugin.c b/plugins/vnc/vnc_plugin.c index 408cfc0e7..88d85afa0 100644 --- a/plugins/vnc/vnc_plugin.c +++ b/plugins/vnc/vnc_plugin.c @@ -946,13 +946,13 @@ static gboolean vnc_encryption_disable_requested; static void remmina_plugin_vnc_rfb_output(const char *format, ...) { TRACE_CALL(__func__); - va_list args; - - va_start(args, format); gchar *f, *p, *ff; if (!rfbEnableClientLogging) return; + + va_list args; + va_start(args, format); /* eliminate the last \n */ f = g_strdup(format); if (f[strlen(f) - 1] == '\n') f[strlen(f) - 1] = '\0'; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 03270e54b..9d2051629 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,131 +4,126 @@ # Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo # Copyright (C) 2016-2021 Antenore Gatta, Giovanni Panozzo # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 51 Franklin +# Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the -# OpenSSL library under certain conditions as described in each -# individual source file, and distribute linked combinations -# including the two. -# You must obey the GNU General Public License in all respects -# for all of the code used other than OpenSSL. If you modify -# file(s) with this exception, you may extend this exception to your -# version of the file(s), but you are not obligated to do so. If you -# do not wish to do so, delete this exception statement from your -# version. If you delete this exception statement from all source -# files in the program, then also delete it here. +# In addition, as a special exception, the copyright holders give permission to +# link the code of portions of this program with the OpenSSL library under +# certain conditions as described in each individual source file, and distribute +# linked combinations including the two. You must obey the GNU General Public +# License in all respects for all of the code used other than OpenSSL. If you +# modify file(s) with this exception, you may extend this exception to your +# version of the file(s), but you are not obligated to do so. If you do not wish +# to do so, delete this exception statement from your version. If you delete +# this exception statement from all source files in the program, then also +# delete it here. - -cmake_minimum_required(VERSION 3.0.0) - -list(APPEND REMMINA_SRCS - "remmina_about.c" - "remmina_about.h" - "remmina_applet_menu.c" - "remmina_applet_menu.h" - "remmina_applet_menu_item.c" - "remmina_applet_menu_item.h" - "remmina_avahi.c" - "remmina_avahi.h" - "remmina.c" - "remmina.h" - "remmina_chat_window.c" - "remmina_chat_window.h" - "remmina_crypt.c" - "remmina_crypt.h" - "remmina_exec.c" - "remmina_exec.h" - "remmina_file.c" - "remmina_file_editor.c" - "remmina_file_editor.h" - "remmina_file.h" - "remmina_file_manager.c" - "remmina_file_manager.h" - "remmina_ftp_client.c" - "remmina_ftp_client.h" - "remmina_icon.c" - "remmina_icon.h" - "remmina_key_chooser.c" - "remmina_key_chooser.h" - "remmina_log.c" - "remmina_log.h" - "remmina_main.c" - "remmina_main.h" - "remmina_marshals.c" - "remmina_marshals.h" - "remmina_marshals.list" - "remmina_masterthread_exec.c" - "remmina_masterthread_exec.h" - "remmina_message_panel.c" - "remmina_message_panel.h" - "remmina_plugin_manager.c" - "remmina_plugin_manager.h" - "remmina_plugin_native.c" - "remmina_plugin_native.h" - "remmina_ext_exec.c" - "remmina_ext_exec.h" - "remmina_pref.c" - "remmina_pref_dialog.c" - "remmina_pref_dialog.h" - "remmina_pref.h" - "remmina_protocol_widget.c" - "remmina_protocol_widget.h" - "remmina_public.c" - "remmina_public.h" - "remmina_scrolled_viewport.c" - "remmina_scrolled_viewport.h" - "remmina_sftp_client.c" - "remmina_sftp_client.h" - "remmina_sftp_plugin.c" - "remmina_sftp_plugin.h" - "remmina_sodium.c" - "remmina_sodium.h" - "remmina_ssh.c" - "remmina_ssh.h" - "remmina_ssh_plugin.c" - "remmina_ssh_plugin.h" - "remmina_string_array.c" - "remmina_string_array.h" - "remmina_string_list.c" - "remmina_string_list.h" - "remmina_unlock.c" - "remmina_unlock.h" - "remmina_utils.c" - "remmina_utils.h" - "remmina_widget_pool.c" - "remmina_widget_pool.h" - "remmina_external_tools.c" - "remmina_external_tools.h" - "remmina_sysinfo.h" - "remmina_sysinfo.c" - "rcw.c" - "rcw.h" - "rmnews.c" - "rmnews.h" - "remmina_mpchange.c" - "remmina_mpchange.h" - "remmina_scheduler.c" - "remmina_scheduler.h" - "remmina_stats.c" - "remmina_stats.h" - "remmina_stats_sender.c" - "remmina_stats_sender.h" - "resources.c" - ) +list( + APPEND + REMMINA_SRCS + "remmina_about.c" + "remmina_about.h" + "remmina_applet_menu.c" + "remmina_applet_menu.h" + "remmina_applet_menu_item.c" + "remmina_applet_menu_item.h" + "remmina_avahi.c" + "remmina_avahi.h" + "remmina.c" + "remmina.h" + "remmina_chat_window.c" + "remmina_chat_window.h" + "remmina_crypt.c" + "remmina_crypt.h" + "remmina_exec.c" + "remmina_exec.h" + "remmina_file.c" + "remmina_file_editor.c" + "remmina_file_editor.h" + "remmina_file.h" + "remmina_file_manager.c" + "remmina_file_manager.h" + "remmina_ftp_client.c" + "remmina_ftp_client.h" + "remmina_icon.c" + "remmina_icon.h" + "remmina_key_chooser.c" + "remmina_key_chooser.h" + "remmina_log.c" + "remmina_log.h" + "remmina_main.c" + "remmina_main.h" + "remmina_marshals.c" + "remmina_marshals.h" + "remmina_marshals.list" + "remmina_masterthread_exec.c" + "remmina_masterthread_exec.h" + "remmina_message_panel.c" + "remmina_message_panel.h" + "remmina_plugin_manager.c" + "remmina_plugin_manager.h" + "remmina_plugin_native.c" + "remmina_plugin_native.h" + "remmina_ext_exec.c" + "remmina_ext_exec.h" + "remmina_pref.c" + "remmina_pref_dialog.c" + "remmina_pref_dialog.h" + "remmina_pref.h" + "remmina_protocol_widget.c" + "remmina_protocol_widget.h" + "remmina_public.c" + "remmina_public.h" + "remmina_scrolled_viewport.c" + "remmina_scrolled_viewport.h" + "remmina_sftp_client.c" + "remmina_sftp_client.h" + "remmina_sftp_plugin.c" + "remmina_sftp_plugin.h" + "remmina_sodium.c" + "remmina_sodium.h" + "remmina_ssh.c" + "remmina_ssh.h" + "remmina_ssh_plugin.c" + "remmina_ssh_plugin.h" + "remmina_string_array.c" + "remmina_string_array.h" + "remmina_string_list.c" + "remmina_string_list.h" + "remmina_unlock.c" + "remmina_unlock.h" + "remmina_utils.c" + "remmina_utils.h" + "remmina_widget_pool.c" + "remmina_widget_pool.h" + "remmina_external_tools.c" + "remmina_external_tools.h" + "remmina_sysinfo.h" + "remmina_sysinfo.c" + "rcw.c" + "rcw.h" + "rmnews.c" + "rmnews.h" + "remmina_mpchange.c" + "remmina_mpchange.h" + "remmina_scheduler.c" + "remmina_scheduler.h" + "remmina_stats.c" + "remmina_stats.h" + "remmina_stats_sender.c" + "remmina_stats_sender.h" + "resources.c") set(RESOURCE_LIST ${CMAKE_CURRENT_SOURCE_DIR}/../data/ui/remmina_about.glade @@ -142,63 +137,67 @@ set(RESOURCE_LIST ${CMAKE_CURRENT_SOURCE_DIR}/../data/ui/remmina_snap_info_dialog.glade ${CMAKE_CURRENT_SOURCE_DIR}/../data/ui/remmina_spinner.glade ${CMAKE_CURRENT_SOURCE_DIR}/../data/ui/remmina_string_list.glade - ${CMAKE_CURRENT_SOURCE_DIR}/../data/ui/remmina_unlock.glade - ) + ${CMAKE_CURRENT_SOURCE_DIR}/../data/ui/remmina_unlock.glade) option(WITH_PYTHONLIBS "Enable Python plugins support" OFF) if(WITH_PYTHONLIBS) - message(STATUS "Python plugins support enabled") - find_suggested_package(PythonLibs) - if(PythonLibs_FOUND) - message(STATUS "Python libs found, Python support enabled") - add_definitions(-DWITH_PYTHONLIBS) - list(FIND REMMINA_SRCS "remmina_exec.c" SRCINDEX) - message(DEBUG "remmina_exec.c found at index: " ${SRCINDEX}) - # Index calculated at "remmina_exec.c" position (43 as of today) - list(INSERT REMMINA_SRCS ${SRCINDEX} - "remmina_plugin_python.c" - "remmina_plugin_python.h" - "remmina_plugin_python_module.c" - "remmina_plugin_python_module.h" - "remmina_plugin_python_remmina.c" - "remmina_plugin_python_remmina.h" - "remmina_plugin_python_protocol_widget.c" - "remmina_plugin_python_protocol_widget.h" - "remmina_plugin_python_remmina_file.c" - "remmina_plugin_python_remmina_file.h" - ) - else() - message(STATUS "Python plugins support enabled, but Python libs not found") - endif() + message(STATUS "Python plugins support enabled") + find_suggested_package(PythonLibs) + if(PythonLibs_FOUND) + message(STATUS "Python libs found, Python support enabled") + add_definitions(-DWITH_PYTHONLIBS) + list(FIND REMMINA_SRCS "remmina_exec.c" SRCINDEX) + message(DEBUG "remmina_exec.c found at index: " ${SRCINDEX}) + # Index calculated at "remmina_exec.c" position (43 as of today) + list( + INSERT + REMMINA_SRCS + ${SRCINDEX} + "remmina_plugin_python.c" + "remmina_plugin_python.h" + "remmina_plugin_python_module.c" + "remmina_plugin_python_module.h" + "remmina_plugin_python_remmina.c" + "remmina_plugin_python_remmina.h" + "remmina_plugin_python_protocol_widget.c" + "remmina_plugin_python_protocol_widget.h" + "remmina_plugin_python_remmina_file.c" + "remmina_plugin_python_remmina_file.h") + else() + message(STATUS "Python plugins support enabled, but Python libs not found") + endif() else() message(STATUS "Python plugins support disabled") endif() message(DEBUG "Source list set to: " ${REMMINA_SRCS}) - -compile_gresources(RESOURCE_FILE - XML_OUT - TYPE EMBED_C - PREFIX /org/remmina/Remmina/src - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} - RESOURCES ${RESOURCE_LIST}) - +compile_gresources( + RESOURCE_FILE + XML_OUT + TYPE + EMBED_C + PREFIX + /org/remmina/Remmina/src + SOURCE_DIR + ${CMAKE_CURRENT_SOURCE_DIR} + RESOURCES + ${RESOURCE_LIST}) add_custom_target(resource DEPENDS ${RESOURCE_FILE}) add_executable(remmina ${REMMINA_SRCS} ${RESOURCE_FILE}) add_dependencies(remmina resource) -target_link_libraries(remmina ${GTK_LIBRARIES}) +target_link_libraries(remmina ${GTK_LIBRARIES} -rdynamic) if(WITH_PYTHONLIBS) - if(PythonLibs_FOUND) - include_directories(${PYTHON_INCLUDE_DIRS}) - target_link_libraries(remmina ${PYTHON_LIBRARIES}) - endif() + if(PythonLibs_FOUND) + include_directories(${PYTHON_INCLUDE_DIRS}) + target_link_libraries(remmina ${PYTHON_LIBRARIES}) + endif() endif() if(WITH_MANPAGES) - install(FILES remmina.1 DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1) + install(FILES remmina.1 DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1) endif() find_package(X11) @@ -208,99 +207,100 @@ target_link_libraries(remmina ${X11_LIBRARIES}) target_link_libraries(remmina ${CMAKE_THREAD_LIBS_INIT}) if(Intl_FOUND) - message(STATUS "${CMAKE_SYSTEM_NAME} detected, building with Intl") - include_directories(${Intl_INCLUDE_DIRS}) - target_link_libraries(remmina ${Intl_LIBRARIES}) + message(STATUS "${CMAKE_SYSTEM_NAME} detected, building with Intl") + include_directories(${Intl_INCLUDE_DIRS}) + target_link_libraries(remmina ${Intl_LIBRARIES}) endif() find_suggested_package(LIBSSH) if(LIBSSH_FOUND) - add_definitions(-DHAVE_LIBSSH) - include_directories(${LIBSSH_INCLUDE_DIRS}) - target_link_libraries(remmina ${LIBSSH_LIBRARIES}) + add_definitions(-DHAVE_LIBSSH) + include_directories(${LIBSSH_INCLUDE_DIRS}) + target_link_libraries(remmina ${LIBSSH_LIBRARIES}) endif() if(GCRYPT_FOUND) - include_directories(${GCRYPT_INCLUDE_DIRS}) - target_link_libraries(remmina ${GCRYPT_LIBRARIES}) + include_directories(${GCRYPT_INCLUDE_DIRS}) + target_link_libraries(remmina ${GCRYPT_LIBRARIES}) endif() if(AVAHI_FOUND) - include_directories(${AVAHI_INCLUDE_DIRS}) - target_link_libraries(remmina ${AVAHI_LIBRARIES}) + include_directories(${AVAHI_INCLUDE_DIRS}) + target_link_libraries(remmina ${AVAHI_LIBRARIES}) endif() if(OPENSSL_FOUND) - include_directories(${OPENSSL_INCLUDE_DIRS}) - target_link_libraries(remmina ${OPENSSL_LIBRARIES}) + include_directories(${OPENSSL_INCLUDE_DIRS}) + target_link_libraries(remmina ${OPENSSL_LIBRARIES}) endif() option(WITH_VTE "Build with support for VTE" ON) if(GTK3_FOUND AND WITH_VTE) - set(_VTE_VERSION_NUMS 2.91 2.90) - foreach(__VTE_VERSION ${_VTE_VERSION_NUMS}) - set(_VTE_VERSION_NUM ${__VTE_VERSION}) - find_suggested_package(VTE) - if(VTE_FOUND) - break() - endif() - message(STATUS "VTE ${__VTE_VERSION} not found") - endforeach() + set(_VTE_VERSION_NUMS 2.91 2.90) + foreach(__VTE_VERSION ${_VTE_VERSION_NUMS}) + set(_VTE_VERSION_NUM ${__VTE_VERSION}) + find_suggested_package(VTE) + if(VTE_FOUND) + break() + endif() + message(STATUS "VTE ${__VTE_VERSION} not found") + endforeach() elseif(WITH_VTE) - set(_VTE_VERSION_NUM) - find_package(VTE) + set(_VTE_VERSION_NUM) + find_package(VTE) endif() if(VTE_FOUND) - add_definitions(-DHAVE_LIBVTE) - include_directories(${VTE_INCLUDE_DIRS}) - target_link_libraries(remmina ${VTE_LIBRARIES}) + add_definitions(-DHAVE_LIBVTE) + include_directories(${VTE_INCLUDE_DIRS}) + target_link_libraries(remmina ${VTE_LIBRARIES}) endif() if(sodium_FOUND) - message(STATUS "Sodium found") - message(STATUS "Sodium include dirs ${sodium_INCLUDE_DIR}") - include_directories(${sodium_INCLUDE_DIR}) - target_link_libraries(remmina sodium) + message(STATUS "Sodium found") + message(STATUS "Sodium include dirs ${sodium_INCLUDE_DIR}") + include_directories(${sodium_INCLUDE_DIR}) + target_link_libraries(remmina sodium) endif() if(GTK3_FOUND) - find_required_package(APPINDICATOR) - if(APPINDICATOR_FOUND) - add_definitions(-DHAVE_LIBAPPINDICATOR) - include_directories(${APPINDICATOR_INCLUDE_DIRS}) - target_link_libraries(remmina ${APPINDICATOR_LIBRARIES}) - message(STATUS "AppIndicator library dirs ${APPINDICATOR_LIBRARIES}") - message(STATUS "AppIndicator include dirs ${APPINDICATOR_INCLUDE_DIRS}") - else() - message(FATAL_ERROR "AppIndicator not found") - endif() - find_required_package(JSONGLIB) - if(JSONGLIB_FOUND) - include_directories(${JSONGLIB_INCLUDE_DIRS}) - target_link_libraries(remmina ${JSONGLIB_LIBRARIES}) - else() - message(FATAL_ERROR "json-glib library not found") - endif() - find_required_package(LIBSOUP24) - if(LIBSOUP24_FOUND) - include_directories(${LIBSOUP24_INCLUDE_DIRS}) - target_link_libraries(remmina ${LIBSOUP24_LIBRARIES}) - else() - message(FATAL_ERROR "libsoup 2.4 library not found") - endif() + find_required_package(APPINDICATOR) + if(APPINDICATOR_FOUND) + add_definitions(-DHAVE_LIBAPPINDICATOR) + include_directories(${APPINDICATOR_INCLUDE_DIRS}) + target_link_libraries(remmina ${APPINDICATOR_LIBRARIES}) + message(STATUS "AppIndicator library dirs ${APPINDICATOR_LIBRARIES}") + message(STATUS "AppIndicator include dirs ${APPINDICATOR_INCLUDE_DIRS}") + else() + message(FATAL_ERROR "AppIndicator not found") + endif() + find_required_package(JSONGLIB) + if(JSONGLIB_FOUND) + include_directories(${JSONGLIB_INCLUDE_DIRS}) + target_link_libraries(remmina ${JSONGLIB_LIBRARIES}) + else() + message(FATAL_ERROR "json-glib library not found") + endif() + find_required_package(LIBSOUP24) + if(LIBSOUP24_FOUND) + include_directories(${LIBSOUP24_INCLUDE_DIRS}) + target_link_libraries(remmina ${LIBSOUP24_LIBRARIES}) + else() + message(FATAL_ERROR "libsoup 2.4 library not found") + endif() endif() include(FindPCRE2) -if (NOT PCRE2_FOUND) - message(FATAL_ERROR "libpcre2 library not found") -endif () +if(NOT PCRE2_FOUND) + message(FATAL_ERROR "libpcre2 library not found") +endif() include_directories(${PCRE2_INCLUDE_DIRS}) add_subdirectory(external_tools) install(TARGETS remmina DESTINATION ${CMAKE_INSTALL_BINDIR}) -install(DIRECTORY include/remmina/ - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/remmina - FILES_MATCHING PATTERN "*.h") - +install( + DIRECTORY include/remmina/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/remmina + FILES_MATCHING + PATTERN "*.h") |