Merge branch '2570-macos-build' into 'master'

make it build on macOS

See merge request Remmina/Remmina!2471

8 files changed, 11 insertions, 12 deletions

diff --git a/cmake/FindLIBVNCSERVER.cmake b/cmake/FindLIBVNCSERVER.cmake
index 36b9a997a..e6dd17daf 100644
--- a/cmake/FindLIBVNCSERVER.cmake
+++ b/cmake/FindLIBVNCSERVER.cmake
@@ -19,7 +19,7 @@
 
 find_package(PkgConfig)
 pkg_check_modules(PC_LIBVNCSERVER libvncserver)
-set(LIBVNCSERVER_DEFINITIONS ${PC_LIBVNCSERVER_CFLAGS_OTHER})
+pkg_check_modules(PC_LIBVNCCLIENT libvncclient)
 
 find_path(LIBVNCSERVER_INCLUDE_DIR NAMES rfb/rfb.h
 	HINTS ${PC_LIBVNCSERVER_INCLUDEDIR} ${PC_LIBVNCSERVER_INCLUDE_DIRS})
@@ -27,11 +27,14 @@ find_path(LIBVNCSERVER_INCLUDE_DIR NAMES rfb/rfb.h
 find_library(LIBVNCSERVER_LIBRARY NAMES vncserver
 	HINTS ${PC_LIBVNCSERVER_LIBDIR} ${PC_LIBVNCSERVER_LIBRARY_DIRS})
 
+find_library(LIBVNCCLIENT_LIBRARY NAMES vncclient
+	HINTS ${PC_LIBVNCCLIENT_LIBDIR} ${PC_LIBVNCCLIENT_LIBRARY_DIRS})
+
 include(FindPackageHandleStandardArgs)
 
 find_package_handle_standard_args(LIBVNCSERVER DEFAULT_MSG LIBVNCSERVER_LIBRARY LIBVNCSERVER_INCLUDE_DIR)
 
-set(LIBVNCSERVER_LIBRARIES ${LIBVNCSERVER_LIBRARY})
+set(LIBVNCSERVER_LIBRARIES ${LIBVNCSERVER_LIBRARY} ${LIBVNCCLIENT_LIBRARY})
 set(LIBVNCSERVER_INCLUDE_DIRS ${LIBVNCSERVER_INCLUDE_DIR})
 
 mark_as_advanced(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARY)
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index c2e301431..829b3dc5a 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -40,7 +40,7 @@ include_directories(${CMAKE_SOURCE_DIR}/plugins)
 set(APPICONSCALE_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/scalable/emblems")
 
 set(REMMINA_COMMON_INCLUDE_DIRS ${GTK3_INCLUDE_DIRS})
-set(REMMINA_COMMON_LIBRARIES ${GTK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+set(REMMINA_COMMON_LIBRARIES ${GTK_LIBRARIES} ${Intl_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 
 find_suggested_package(LIBSSH)
 if(LIBSSH_FOUND)
diff --git a/plugins/gvnc/CMakeLists.txt b/plugins/gvnc/CMakeLists.txt
index 0dc5782c5..ca5c1cdfa 100644
--- a/plugins/gvnc/CMakeLists.txt
+++ b/plugins/gvnc/CMakeLists.txt
@@ -36,7 +36,7 @@ set(REMMINA_PLUGIN_GVNC_SRCS
     gvnc_plugin.c
     )
 
-add_library(remmina-plugin-gvnc ${REMMINA_PLUGIN_GVNC_SRCS})
+add_library(remmina-plugin-gvnc MODULE ${REMMINA_PLUGIN_GVNC_SRCS})
 set_target_properties(remmina-plugin-gvnc PROPERTIES PREFIX "")
 set_target_properties(remmina-plugin-gvnc PROPERTIES NO_SONAME 1)
 
diff --git a/plugins/python_wrapper/CMakeLists.txt b/plugins/python_wrapper/CMakeLists.txt
index 54c6cf3db..d77eac5e1 100644
--- a/plugins/python_wrapper/CMakeLists.txt
+++ b/plugins/python_wrapper/CMakeLists.txt
@@ -55,11 +55,10 @@ set(REMMINA_PLUGIN_PYTHON_WRAPPER_SRCS
     python_wrapper_tool.h
     )
 
-add_library(remmina-plugin-python_wrapper ${REMMINA_PLUGIN_PYTHON_WRAPPER_SRCS})
+add_library(remmina-plugin-python_wrapper MODULE ${REMMINA_PLUGIN_PYTHON_WRAPPER_SRCS})
 set_target_properties(remmina-plugin-python_wrapper PROPERTIES PREFIX "")
 set_target_properties(remmina-plugin-python_wrapper PROPERTIES NO_SONAME 1)
 
-message(${REMMINA_COMMON_INCLUDE_DIRS})
 include_directories(${REMMINA_COMMON_INCLUDE_DIRS} ${PYTHON_WRAPPER_INCLUDE_DIRS})
 target_link_libraries(remmina-plugin-python_wrapper ${REMMINA_COMMON_LIBRARIES} ${PYTHON_WRAPPER_LIBRARIES})
 
diff --git a/plugins/spice/CMakeLists.txt b/plugins/spice/CMakeLists.txt
index 87989be40..875d53f4f 100644
--- a/plugins/spice/CMakeLists.txt
+++ b/plugins/spice/CMakeLists.txt
@@ -36,7 +36,7 @@ set(REMMINA_PLUGIN_SPICE_SRCS
         spice_plugin_usb.c
         )
 
-add_library(remmina-plugin-spice ${REMMINA_PLUGIN_SPICE_SRCS})
+add_library(remmina-plugin-spice MODULE ${REMMINA_PLUGIN_SPICE_SRCS})
 set_target_properties(remmina-plugin-spice PROPERTIES PREFIX "")
 set_target_properties(remmina-plugin-spice PROPERTIES NO_SONAME 1)
 
diff --git a/plugins/vnc/CMakeLists.txt b/plugins/vnc/CMakeLists.txt
index 14c0bf5c9..eccc9d851 100644
--- a/plugins/vnc/CMakeLists.txt
+++ b/plugins/vnc/CMakeLists.txt
@@ -32,9 +32,6 @@
 # files in the program, then also delete it here.
 
 
-set(LIBVNCSERVER_INCLUDE_DIRS)
-set(LIBVNCSERVER_LIBRARIES vncclient)
-
 set(REMMINA_PLUGIN_VNC_SRCS
 	vnc_plugin.c
 	vnc_plugin.h
diff --git a/plugins/x2go/CMakeLists.txt b/plugins/x2go/CMakeLists.txt
index 26a795217..97df0700f 100644
--- a/plugins/x2go/CMakeLists.txt
+++ b/plugins/x2go/CMakeLists.txt
@@ -40,7 +40,7 @@ set(REMMINA_PLUGIN_X2GO_SRCS
     x2go_plugin.h
     )
 
-add_library(remmina-plugin-x2go ${REMMINA_PLUGIN_X2GO_SRCS})
+add_library(remmina-plugin-x2go MODULE ${REMMINA_PLUGIN_X2GO_SRCS})
 set_target_properties(remmina-plugin-x2go PROPERTIES PREFIX "")
 set_target_properties(remmina-plugin-x2go PROPERTIES NO_SONAME 1)
 
@@ -52,7 +52,6 @@ target_link_libraries(remmina-plugin-x2go
     ${REMMINA_COMMON_LIBRARIES}
     ${XKBFILE_LIBRARIES}
     ${LIBSSH_LIBRARIES}
-    ${Intl_LIBRARIES}
     ${X11_X11_LIB})
 
 install(TARGETS remmina-plugin-x2go DESTINATION ${REMMINA_PLUGINDIR})
diff --git a/src/remmina_ssh.c b/src/remmina_ssh.c
index 9fcda715b..9802efe77 100644
--- a/src/remmina_ssh.c
+++ b/src/remmina_ssh.c
@@ -41,6 +41,7 @@
 
 /* To get definitions of NI_MAXHOST and NI_MAXSERV from <netdb.h> */
 #define _DEFAULT_SOURCE
+#define _DARWIN_C_SOURCE
 
 /* Define this before stdlib.h to have posix_openpt */
 #define _XOPEN_SOURCE 600