Merge branch 'fundawang-next' into next - CMake rules adjustments whe…

…n compiling under linux - closes #634 - all these plugins are modules, so set module property in cmake rules - add pthread lib to common linking libraries - link against x11, for XOpenDisplay and other X11 functions - link aginst glib2 for g_* functions
FreeRDP · Aug 30, 2015 · a1971b3 · a1971b3
2 parents 3c3afc9 + 1da2c6a
commit a1971b3
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/remmina-plugins-gnome/CMakeLists.txt b/remmina-plugins-gnome/CMakeLists.txt
@@ -37,15 +37,15 @@ 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)
 
 	include_directories(${GTK_INCLUDE_DIRS})
 	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()
diff --git 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)

diff --git 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})
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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)