diff options
| author | Antenore Gatta (tmow) <antenore@simbiosi.org> | 2022-10-03 20:38:35 +0300 |
|---|---|---|
| committer | Antenore Gatta (tmow) <antenore@simbiosi.org> | 2022-10-03 20:38:35 +0300 |
| commit | edbaeb1b588edc0e969b0eedd731758aad369391 (patch) | |
| tree | 9c865a0d2d6319d77c0c369819a37188837028c7 /cmake | |
| parent | 30629c1629c7ac15f00340e8d205be59eade1ce9 (diff) | |
Multiple changes to build and run with libsoup 3.0
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindLIBSOUP.cmake (renamed from cmake/FindLIBSOUP24.cmake) | 27 | ||||
| -rw-r--r-- | cmake/FindWEBKIT2GTK.cmake | 6 |
2 files changed, 16 insertions, 17 deletions
diff --git a/cmake/FindLIBSOUP24.cmake b/cmake/FindLIBSOUP.cmake index 96ec22239..23cc06ff6 100644 --- a/cmake/FindLIBSOUP24.cmake +++ b/cmake/FindLIBSOUP.cmake @@ -1,7 +1,5 @@ # Remmina - The GTK+ Remote Desktop Client # -# Copyright (C) 2011 Marc-Andre Moreau -# Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo # Copyright (C) 2016-2022 Antenore Gatta, Giovanni Panozzo # # This program is free software; you can redistribute it and/or modify @@ -21,26 +19,25 @@ include(FindPackageHandleStandardArgs) -pkg_check_modules(PC_LIBSOUP24 libsoup-2.4) +pkg_search_module(PC_LIBSOUP REQUIRED libsoup-3.0 libsoup-2.4) - -find_path(LIBSOUP24_INCLUDE_DIR NAMES libsoup/soup.h - HINTS ${PC_LIBSOUP24_INCLUDEDIR} ${PC_LIBSOUP24_INCLUDE_DIRS} +find_path(LIBSOUP_INCLUDE_DIR NAMES libsoup/soup.h + HINTS ${PC_LIBSOUP_INCLUDEDIR} ${PC_LIBSOUP_INCLUDE_DIRS} ) -find_library(LIBSOUP24_LIBRARY - NAMES soup-2.4 - HINTS ${PC_LIBSOUP24_LIBDIR} ${PC_LIBSOUP24_LIBRARY_DIRS} +find_library(LIBSOUP_LIBRARY + NAMES soup soup-3.0 soup-2.4 + HINTS ${PC_LIBSOUP_LIBDIR} ${PC_LIBSOUP_LIBRARY_DIRS} ) -if (LIBSOUP24_INCLUDE_DIR AND LIBSOUP24_LIBRARY) - find_package_handle_standard_args(LIBSOUP24 DEFAULT_MSG LIBSOUP24_LIBRARY LIBSOUP24_INCLUDE_DIR) +if (LIBSOUP_INCLUDE_DIR AND LIBSOUP_LIBRARY) + find_package_handle_standard_args(LIBSOUP DEFAULT_MSG LIBSOUP_LIBRARY LIBSOUP_INCLUDE_DIR) endif() -if (LIBSOUP24_FOUND) - set(LIBSOUP24_LIBRARIES ${LIBSOUP24_LIBRARY}) - set(LIBSOUP24_INCLUDE_DIRS ${LIBSOUP24_INCLUDE_DIR}) +if (LIBSOUP_FOUND) + set(LIBSOUP_LIBRARIES ${LIBSOUP_LIBRARY}) + set(LIBSOUP_INCLUDE_DIRS ${LIBSOUP_INCLUDE_DIR}) endif() -mark_as_advanced(LIBSOUP24_INCLUDE_DIR LIBSOUP24_LIBRARY) +mark_as_advanced(LIBSOUP_INCLUDE_DIR LIBSOUP_LIBRARY) diff --git a/cmake/FindWEBKIT2GTK.cmake b/cmake/FindWEBKIT2GTK.cmake index 391fdfe9d..0af554cff 100644 --- a/cmake/FindWEBKIT2GTK.cmake +++ b/cmake/FindWEBKIT2GTK.cmake @@ -33,7 +33,8 @@ find_package(PkgConfig) if(PKG_CONFIG_FOUND) - pkg_check_modules(_WEBKIT2GTK webkit2gtk-4.0) + #pkg_check_modules(_WEBKIT2GTK webkit2gtk-4.0) + pkg_search_module(_WEBKIT2GTK webkit2gtk-4.1 webkit2gtk-4.0) endif(PKG_CONFIG_FOUND) set(WEBKIT2GTK_DEFINITIONS ${_WEBKIT2GTK_CFLAGS_OTHER}) @@ -42,7 +43,8 @@ find_path(WEBKIT2GTK_INCLUDE_DIR NAMES webkit2/webkit2.h HINTS ${_WEBKIT2GTK_INCLUDEDIR} ${_WEBKIT2GTK_INCLUDE_DIRS} ) -find_library(WEBKIT2GTK_LIB webkit2gtk-4.0 +find_library(WEBKIT2GTK_LIB + NAMES webkit2gtk-4.1 webkit2gtk-4.0 HINTS ${_WEBKIT2GTK_LIBDIR} ${_WEBKIT2GTK_LIBRARY_DIRS} |