From 13123dced135746b74f1f40148bfa9cef0c57dc0 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Sun, 15 Sep 2024 19:20:34 +0200 Subject: Use Adwaita 1.2, bump CI to Ubuntu 24.04 --- plugins/omemo/CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'plugins/omemo/CMakeLists.txt') diff --git a/plugins/omemo/CMakeLists.txt b/plugins/omemo/CMakeLists.txt index a8920d72..410d5712 100644 --- a/plugins/omemo/CMakeLists.txt +++ b/plugins/omemo/CMakeLists.txt @@ -3,7 +3,7 @@ find_package(Gettext) include(${GETTEXT_USE_FILE}) gettext_compile(${GETTEXT_PACKAGE} SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/po TARGET_NAME ${GETTEXT_PACKAGE}-translations) -find_package(Adwaita REQUIRED) +find_package(Adwaita ${Adwaita_GLOBAL_VERSION} REQUIRED) find_package(Qrencode REQUIRED) find_packages(OMEMO_PACKAGES REQUIRED Adwaita @@ -35,9 +35,6 @@ compile_gresources( SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data ) set(OMEMO_DEFINITIONS) -if(Adwaita_VERSION VERSION_GREATER_EQUAL "1.2") - set(OMEMO_DEFINITIONS ${OMEMO_DEFINITIONS} Adw_1_2) -endif() vala_precompile(OMEMO_VALA_C SOURCES -- cgit v1.2.3-70-g09d2