Fixing missing webkit dependencies

Signed-off-by: Antenore Gatta <antenore@simbiosi.org>

3 files changed, 22 insertions, 12 deletions

diff --git a/cmake/FindWEBKIT2GTK.cmake b/cmake/FindWEBKIT2GTK.cmake
index c766ebfe1..391fdfe9d 100644
--- a/cmake/FindWEBKIT2GTK.cmake
+++ b/cmake/FindWEBKIT2GTK.cmake
@@ -36,25 +36,27 @@ if(PKG_CONFIG_FOUND)
     pkg_check_modules(_WEBKIT2GTK webkit2gtk-4.0)
 endif(PKG_CONFIG_FOUND)
 
+set(WEBKIT2GTK_DEFINITIONS ${_WEBKIT2GTK_CFLAGS_OTHER})
+
+find_path(WEBKIT2GTK_INCLUDE_DIR NAMES webkit2/webkit2.h
+    HINTS ${_WEBKIT2GTK_INCLUDEDIR} ${_WEBKIT2GTK_INCLUDE_DIRS}
+)
+
 find_library(WEBKIT2GTK_LIB webkit2gtk-4.0
     HINTS
+    ${_WEBKIT2GTK_LIBDIR}
     ${_WEBKIT2GTK_LIBRARY_DIRS}
-    ${COMMON_LIB_DIR}
 )
 
+include(FindPackageHandleStandardArgs)
+
+find_package_handle_standard_args(WEBKIT2GTK DEFAULT_MSG  WEBKIT2GTK_LIB WEBKIT2GTK_INCLUDE_DIR)
+
 if(WEBKIT2GTK_LIB)
     set(WEBKIT2GTK_LIBRARIES ${WEBKIT2GTK_LIB})
     message(STATUS "WEBKIT2GTK-Libs: ${WEBKIT2GTK_LIBRARIES}")
 endif()
 
-find_path(WEBKIT2GTK_INCLUDE_DIR webkit2.h
-    PATH_SUFFIXES webkit2
-    PATHS
-    ${_WEBKIT2GTK_INCLUDE_DIRS}
-    ${COMMON_INCLUDE_DIR}
-)
-
-
 if(WEBKIT2GTK_INCLUDE_DIR)
     set(WEBKIT2GTK_INCLUDE_DIRS ${WEBKIT2GTK_INCLUDE_DIR})
     message(STATUS "WEBKIT2GTK-Include-Dirs: ${WEBKIT2GTK_INCLUDE_DIRS}")
@@ -63,3 +65,5 @@ endif()
 if(WEBKIT2GTK_INCLUDE_DIRS)
     set(WEBKIT2GTK_FOUND TRUE)
 endif()
+
+mark_as_advanced(WEBKIT2GTK_INCLUDE_DIR WEBKIT2GTK_LIB)
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index b3e5daed4..1075bd7fd 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -103,7 +103,7 @@ if(WITH_WWW)
     message(STATUS "Enabling WWW plugin.")
     add_definitions(-DWITH_WWW)
     find_suggested_package(WEBKIT2GTK)
-    if(_WEBKIT2GTKFOUND)
+    if(WEBKIT2GTK_FOUND)
         add_subdirectory(www)
     endif()
 else()
diff --git a/plugins/www/CMakeLists.txt b/plugins/www/CMakeLists.txt
index 445646b19..cd1ab3a32 100644
--- a/plugins/www/CMakeLists.txt
+++ b/plugins/www/CMakeLists.txt
@@ -44,8 +44,14 @@ set_target_properties(remmina-plugin-www PROPERTIES PREFIX "")
 set_target_properties(remmina-plugin-www PROPERTIES NO_SONAME 1)
 
 add_definitions(${WEBKIT2GTK_CFLAGS_OTHER})
-include_directories(${REMMINA_COMMON_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} ${WEBKIT2GTK_INCLUDE_DIRS})
-target_link_libraries(remmina-plugin-www ${REMMINA_COMMON_LIBRARIES} ${WEBKIT2GTK_LIBRARIES})
+
+find_required_package(LIBSOUP24)
+if(LIBSOUP24_FOUND)
+    include_directories(${REMMINA_COMMON_INCLUDE_DIRS} ${WEBKIT2GTK_INCLUDE_DIRS} ${LIBSOUP24_INCLUDE_DIRS})
+    target_link_libraries(remmina-plugin-www ${REMMINA_COMMON_LIBRARIES} ${LIBSOUP24_LIBRARIES} ${WEBKIT2GTK_LIBRARIES})
+else()
+    message(FATAL_ERROR "libsoup 2.4 library not found")
+endif()
 
 install(TARGETS remmina-plugin-www DESTINATION ${REMMINA_PLUGINDIR})