From 681d88b47475f57a93310e77e6dd337b3b652bd3 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 31 Aug 2015 01:42:41 +0800 Subject: [PATCH 1/5] all these plugins are modules, so set module property in cmake rules --- remmina-plugins-gnome/CMakeLists.txt | 2 +- remmina-plugins/rdp/CMakeLists.txt | 2 +- remmina-plugins/telepathy/CMakeLists.txt | 2 +- remmina-plugins/tool_hello_world/CMakeLists.txt | 2 +- remmina-plugins/vnc/CMakeLists.txt | 2 +- remmina-plugins/xdmcp/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/remmina-plugins-gnome/CMakeLists.txt b/remmina-plugins-gnome/CMakeLists.txt index 8633c3c456..3694e27a31 100644 --- a/remmina-plugins-gnome/CMakeLists.txt +++ b/remmina-plugins-gnome/CMakeLists.txt @@ -37,7 +37,7 @@ if(GNOMEKEYRING_FOUND) src/gkeyring_plugin.c ) - add_library(remmina-plugins-gnome ${REMMINA_PLUGINS_GNOME_SRCS}) + add_library(remmina-plugins-gnome MODULE ${REMMINA_PLUGINS_GNOME_SRCS}) set_target_properties(remmina-plugins-gnome PROPERTIES PREFIX "") set_target_properties(remmina-plugins-gnome PROPERTIES NO_SONAME 1) diff --git a/remmina-plugins/rdp/CMakeLists.txt b/remmina-plugins/rdp/CMakeLists.txt index fe1e40d987..2c694c001c 100644 --- a/remmina-plugins/rdp/CMakeLists.txt +++ b/remmina-plugins/rdp/CMakeLists.txt @@ -58,7 +58,7 @@ add_definitions(-DFREERDP_REQUIRED_MAJOR=${FREERDP_REQUIRED_MAJOR}) add_definitions(-DFREERDP_REQUIRED_MINOR=${FREERDP_REQUIRED_MINOR}) add_definitions(-DFREERDP_REQUIRED_REVISION=${FREERDP_REQUIRED_REVISION}) -add_library(remmina-plugin-rdp ${REMMINA_PLUGIN_RDP_SRCS}) +add_library(remmina-plugin-rdp MODULE ${REMMINA_PLUGIN_RDP_SRCS}) set_target_properties(remmina-plugin-rdp PROPERTIES PREFIX "") set_target_properties(remmina-plugin-rdp PROPERTIES NO_SONAME 1) diff --git a/remmina-plugins/telepathy/CMakeLists.txt b/remmina-plugins/telepathy/CMakeLists.txt index f667c37456..f97fb45672 100644 --- a/remmina-plugins/telepathy/CMakeLists.txt +++ b/remmina-plugins/telepathy/CMakeLists.txt @@ -35,7 +35,7 @@ set(REMMINA_PLUGIN_TELEPATHY_SRCS telepathy_plugin.c ) -add_library(remmina-plugin-telepathy ${REMMINA_PLUGIN_TELEPATHY_SRCS}) +add_library(remmina-plugin-telepathy MODULE ${REMMINA_PLUGIN_TELEPATHY_SRCS}) set_target_properties(remmina-plugin-telepathy PROPERTIES PREFIX "") set_target_properties(remmina-plugin-telepathy PROPERTIES NO_SONAME 1) diff --git a/remmina-plugins/tool_hello_world/CMakeLists.txt b/remmina-plugins/tool_hello_world/CMakeLists.txt index 794c283114..63cc38ab09 100644 --- a/remmina-plugins/tool_hello_world/CMakeLists.txt +++ b/remmina-plugins/tool_hello_world/CMakeLists.txt @@ -36,7 +36,7 @@ set(REMMINA_PLUGIN_SRCS plugin.c ) -add_library(remmina-plugin-tool_hello_world ${REMMINA_PLUGIN_SRCS}) +add_library(remmina-plugin-tool_hello_world MODULE ${REMMINA_PLUGIN_SRCS}) set_target_properties(remmina-plugin-tool_hello_world PROPERTIES PREFIX "") set_target_properties(remmina-plugin-tool_hello_world PROPERTIES NO_SONAME 1) diff --git a/remmina-plugins/vnc/CMakeLists.txt b/remmina-plugins/vnc/CMakeLists.txt index a9fbac736a..d7a8e671f7 100644 --- a/remmina-plugins/vnc/CMakeLists.txt +++ b/remmina-plugins/vnc/CMakeLists.txt @@ -38,7 +38,7 @@ set(REMMINA_PLUGIN_VNC_SRCS vnc_plugin.c ) -add_library(remmina-plugin-vnc ${REMMINA_PLUGIN_VNC_SRCS}) +add_library(remmina-plugin-vnc MODULE ${REMMINA_PLUGIN_VNC_SRCS}) set_target_properties(remmina-plugin-vnc PROPERTIES PREFIX "") set_target_properties(remmina-plugin-vnc PROPERTIES NO_SONAME 1) diff --git a/remmina-plugins/xdmcp/CMakeLists.txt b/remmina-plugins/xdmcp/CMakeLists.txt index e807d7d517..3acaf94637 100644 --- a/remmina-plugins/xdmcp/CMakeLists.txt +++ b/remmina-plugins/xdmcp/CMakeLists.txt @@ -35,7 +35,7 @@ set(REMMINA_PLUGIN_XDMCP_SRCS xdmcp_plugin.c ) -add_library(remmina-plugin-xdmcp ${REMMINA_PLUGIN_XDMCP_SRCS}) +add_library(remmina-plugin-xdmcp MODULE ${REMMINA_PLUGIN_XDMCP_SRCS}) set_target_properties(remmina-plugin-xdmcp PROPERTIES PREFIX "") set_target_properties(remmina-plugin-xdmcp PROPERTIES NO_SONAME 1) From 8ab81c83fad46e5a4e7102443adc240728cceddc Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 31 Aug 2015 01:43:55 +0800 Subject: [PATCH 2/5] add pthread lib to common linking libraries --- remmina-plugins/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remmina-plugins/CMakeLists.txt b/remmina-plugins/CMakeLists.txt index a3c13cde57..72d29a322b 100644 --- a/remmina-plugins/CMakeLists.txt +++ b/remmina-plugins/CMakeLists.txt @@ -43,7 +43,7 @@ set(APPICON16_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/16x16/emblems") set(APPICON22_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/22x22/emblems") set(REMMINA_COMMON_INCLUDE_DIRS ${GTK_INCLUDE_DIRS}) -set(REMMINA_COMMON_LIBRARIES ${GTK_LIBRARIES}) +set(REMMINA_COMMON_LIBRARIES ${GTK_LIBRARIES} ${PTHREAD_LIBRARY}) find_suggested_package(LIBSSH) if(LIBSSH_FOUND) From 66e88ec374478a6f468eae97ad1f80276a5b45bb Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 31 Aug 2015 01:44:20 +0800 Subject: [PATCH 3/5] link against x11, for XOpenDisplay and other X11 functions --- remmina-plugins/nx/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/remmina-plugins/nx/CMakeLists.txt b/remmina-plugins/nx/CMakeLists.txt index f0d15cf907..c33102db1e 100644 --- a/remmina-plugins/nx/CMakeLists.txt +++ b/remmina-plugins/nx/CMakeLists.txt @@ -44,8 +44,10 @@ add_library(remmina-plugin-nx ${REMMINA_PLUGIN_NX_SRCS}) set_target_properties(remmina-plugin-nx PROPERTIES PREFIX "") set_target_properties(remmina-plugin-nx PROPERTIES NO_SONAME 1) +find_package(X11) + include_directories(${REMMINA_COMMON_INCLUDE_DIRS} ${XKBFILE_INCLUDE_DIRS} ${LIBSSH_INCLUDE_DIRS}) -target_link_libraries(remmina-plugin-nx ${REMMINA_COMMON_LIBRARIES} ${XKBFILE_LIBRARIES} ${LIBSSH_LIBRARIES}) +target_link_libraries(remmina-plugin-nx ${REMMINA_COMMON_LIBRARIES} ${XKBFILE_LIBRARIES} ${LIBSSH_LIBRARIES} ${X11_X11_LIB}) install(TARGETS remmina-plugin-nx DESTINATION ${REMMINA_PLUGINDIR}) From 7c0670c355fccf8493f1bc5e74a5db00b53f967f Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 31 Aug 2015 01:48:08 +0800 Subject: [PATCH 4/5] link aginst glib2 for g_* functions --- remmina-plugins-gnome/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remmina-plugins-gnome/CMakeLists.txt b/remmina-plugins-gnome/CMakeLists.txt index 3694e27a31..7670d416f6 100644 --- a/remmina-plugins-gnome/CMakeLists.txt +++ b/remmina-plugins-gnome/CMakeLists.txt @@ -45,7 +45,7 @@ if(GNOMEKEYRING_FOUND) target_link_libraries(remmina-plugins-gnome ${GTK_LIBRARY_DIRS}) include_directories(${GNOMEKEYRING_INCLUDE_DIRS}) - target_link_libraries(remmina-plugins-gnome ${GNOMEKEYRING_LIBRARIES}) + target_link_libraries(remmina-plugins-gnome ${GNOMEKEYRING_LIBRARIES} ${GLIB2_LIBRARY}) install(TARGETS remmina-plugins-gnome DESTINATION ${REMMINA_PLUGINDIR}) endif() From d7d034cdaae11afc0359d8731bceaf8a47093661 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 31 Aug 2015 01:48:08 +0800 Subject: [PATCH 5/5] link against glib2 for g_* functions --- remmina-plugins-gnome/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remmina-plugins-gnome/CMakeLists.txt b/remmina-plugins-gnome/CMakeLists.txt index 3694e27a31..7670d416f6 100644 --- a/remmina-plugins-gnome/CMakeLists.txt +++ b/remmina-plugins-gnome/CMakeLists.txt @@ -45,7 +45,7 @@ if(GNOMEKEYRING_FOUND) target_link_libraries(remmina-plugins-gnome ${GTK_LIBRARY_DIRS}) include_directories(${GNOMEKEYRING_INCLUDE_DIRS}) - target_link_libraries(remmina-plugins-gnome ${GNOMEKEYRING_LIBRARIES}) + target_link_libraries(remmina-plugins-gnome ${GNOMEKEYRING_LIBRARIES} ${GLIB2_LIBRARY}) install(TARGETS remmina-plugins-gnome DESTINATION ${REMMINA_PLUGINDIR}) endif()