[evolution] Misc: Do not rely on build flags provided by evolution-data-server

[Milan Crha <mcrha src gnome org>]

commit 7b62441b5ff631a9a9ef332443abe243c78f5885
Author: Milan Crha <mcrha redhat com>
Date:   Mon Nov 8 17:53:38 2021 +0100

    Misc: Do not rely on build flags provided by evolution-data-server
    
    Related to https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/83

 CMakeLists.txt               | 10 ++++++++--
 src/composer/CMakeLists.txt  |  4 ++--
 src/mail/CMakeLists.txt      |  7 +++++--
 src/smime/gui/CMakeLists.txt |  4 ++--
 src/smime/lib/CMakeLists.txt |  4 ++--
 5 files changed, 19 insertions(+), 10 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ba3ef72f7..02e9c86d74 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,6 +83,7 @@ set(libpst_minimum_version 0.6.54)
 set(libxml_minimum_version 2.7.3)
 set(shared_mime_info_minimum_version 0.22)
 set(webkit2gtk_minimum_version 2.28.0)
+set(sqlite_minimum_version 3.7.17)
 
 # Optional Packages
 set(champlain_minimum_version 0.12)
@@ -280,6 +281,7 @@ pkg_check_modules(EVOLUTION_DATA_SERVER REQUIRED
 pkg_check_modules(A11Y REQUIRED atk)
 pkg_check_modules(LIBSOUP REQUIRED libsoup-2.4>=${soup_minimum_version})
 pkg_check_modules(WEB_EXTENSION REQUIRED webkit2gtk-4.0>=${webkit2gtk_minimum_version})
+pkg_check_modules(SQLITE3 REQUIRED sqlite3>=${sqlite_minimum_version})
 
 pkg_check_variable(EDS_SOURCES_DBUS_SERVICE_NAME evolution-data-server-1.2 sourcesdbusservicename)
 
@@ -579,8 +581,12 @@ unset(optupper)
 # as both gnutls and mozilla-nss have a header called "pkcs12.h" which is
 # included in smime/lib/e-pkcs12.c. It wants the Mozilla NSS one.
 
-set(CERT_UI_INCLUDES ${MANUAL_NSPR_INCLUDES} ${MANUAL_NSS_INCLUDES})
-set(CERT_UI_LIBS ${MANUAL_NSPR_LIBS} ${MANUAL_NSS_LIBS})
+if((NOT (mozilla_nspr STREQUAL "")) AND (NOT (mozilla_nss STREQUAL "")))
+       pkg_check_modules(CERT_UI REQUIRED ${mozilla_nspr} ${mozilla_nss})
+else((NOT (mozilla_nspr STREQUAL "")) AND (NOT (mozilla_nss STREQUAL "")))
+       set(CERT_UI_INCLUDE_DIRS ${MANUAL_NSPR_INCLUDES} ${MANUAL_NSS_INCLUDES})
+       set(CERT_UI_LDFLAGS ${MANUAL_NSPR_LIBS} ${MANUAL_NSS_LIBS})
+endif((NOT (mozilla_nspr STREQUAL "")) AND (NOT (mozilla_nss STREQUAL "")))
 
 # ******************************
 # Libnotify
diff --git a/src/composer/CMakeLists.txt b/src/composer/CMakeLists.txt
index 4335920133..b609d8dbe5 100644
--- a/src/composer/CMakeLists.txt
+++ b/src/composer/CMakeLists.txt
@@ -66,14 +66,14 @@ target_include_directories(evolution-mail-composer PUBLIC
        ${CMAKE_SOURCE_DIR}/src
        ${CMAKE_CURRENT_BINARY_DIR}
        ${ENCHANT_INCLUDE_DIRS}
-       ${CERT_UI_INCLUDES}
+       ${CERT_UI_INCLUDE_DIRS}
        ${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
        ${GNOME_PLATFORM_INCLUDE_DIRS}
 )
 
 target_link_libraries(evolution-mail-composer
        ${DEPENDENCIES}
-       ${CERT_UI_LIBS}
+       ${CERT_UI_LDFLAGS}
        ${EVOLUTION_DATA_SERVER_LDFLAGS}
        ${GNOME_PLATFORM_LDFLAGS}
 )
diff --git a/src/mail/CMakeLists.txt b/src/mail/CMakeLists.txt
index 0cd0a9a842..d2b0bcc7e3 100644
--- a/src/mail/CMakeLists.txt
+++ b/src/mail/CMakeLists.txt
@@ -235,6 +235,7 @@ target_compile_options(evolution-mail PUBLIC
        ${CANBERRA_CFLAGS}
        ${EVOLUTION_DATA_SERVER_CFLAGS}
        ${GNOME_PLATFORM_CFLAGS}
+       ${SQLITE3_CFLAGS}
 )
 
 target_include_directories(evolution-mail PUBLIC
@@ -253,18 +254,20 @@ target_include_directories(evolution-mail PUBLIC
        ${CMAKE_SOURCE_DIR}/src/smime/lib
        ${CMAKE_SOURCE_DIR}/src/smime/gui
        ${CMAKE_CURRENT_SOURCE_DIR}
-       ${CERT_UI_INCLUDES}
+       ${CERT_UI_INCLUDE_DIRS}
        ${CANBERRA_INCLUDE_DIRS}
        ${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
        ${GNOME_PLATFORM_INCLUDE_DIRS}
+       ${SQLITE3_INCLUDE_DIRS}
 )
 
 target_link_libraries(evolution-mail
        ${DEPENDENCIES}
-       ${CERT_UI_LIBS}
+       ${CERT_UI_LDFLAGS}
        ${CANBERRA_LDFLAGS}
        ${EVOLUTION_DATA_SERVER_LDFLAGS}
        ${GNOME_PLATFORM_LDFLAGS}
+       ${SQLITE3_LDFLAGS}
 )
 
 install(TARGETS evolution-mail
diff --git a/src/smime/gui/CMakeLists.txt b/src/smime/gui/CMakeLists.txt
index 5efcb4232a..89ed22f99a 100644
--- a/src/smime/gui/CMakeLists.txt
+++ b/src/smime/gui/CMakeLists.txt
@@ -41,14 +41,14 @@ target_include_directories(evolution-smime PUBLIC
        ${CMAKE_SOURCE_DIR}/src
        ${CMAKE_CURRENT_BINARY_DIR}
        ${CMAKE_SOURCE_DIR}/src/smime/lib
-       ${CERT_UI_INCLUDES}
+       ${CERT_UI_INCLUDE_DIRS}
        ${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
        ${GNOME_PLATFORM_INCLUDE_DIRS}
 )
 
 target_link_libraries(evolution-smime
        ${DEPENDENCIES}
-       ${CERT_UI_LIBS}
+       ${CERT_UI_LDFLAGS}
        ${EVOLUTION_DATA_SERVER_LDFLAGS}
        ${GNOME_PLATFORM_LDFLAGS}
 )
diff --git a/src/smime/lib/CMakeLists.txt b/src/smime/lib/CMakeLists.txt
index 0826c417fd..7f15427da4 100644
--- a/src/smime/lib/CMakeLists.txt
+++ b/src/smime/lib/CMakeLists.txt
@@ -36,14 +36,14 @@ target_include_directories(essmime PUBLIC
        ${CMAKE_BINARY_DIR}/src
        ${CMAKE_SOURCE_DIR}/src
        ${CMAKE_CURRENT_BINARY_DIR}
-       ${CERT_UI_INCLUDES}
+       ${CERT_UI_INCLUDE_DIRS}
        ${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
        ${GNOME_PLATFORM_INCLUDE_DIRS}
 )
 
 target_link_libraries(essmime
        ${DEPENDENCIES}
-       ${CERT_UI_LIBS}
+       ${CERT_UI_LDFLAGS}
        ${EVOLUTION_DATA_SERVER_LDFLAGS}
        ${GNOME_PLATFORM_LDFLAGS}
 )