[evolution-data-server] Require as hard dependency some dependencies
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Require as hard dependency some dependencies
- Date: Mon, 10 Oct 2016 14:18:26 +0000 (UTC)
commit dc3139ab9856bb7540d78090223f23e1e1c40824
Author: Milan Crha <mcrha redhat com>
Date: Mon Oct 10 16:19:11 2016 +0200
Require as hard dependency some dependencies
CMakeLists.txt | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d77e640..48e3f92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -302,7 +302,7 @@ if(NOT deflateEnd_exists)
message(FATAL_ERROR "zlib doesn't provide deflateEnd")
endif(NOT deflateEnd_exists)
-pkg_check_modules(GNOME_PLATFORM
+pkg_check_modules(GNOME_PLATFORM REQUIRED
gio-2.0>=${glib_minimum_version}
gmodule-2.0>=${glib_minimum_version}
libxml-2.0>=${libxml_minimum_version}
@@ -732,7 +732,7 @@ unset(defval)
# ******************************
# sqlite3 flags
# ******************************
-pkg_check_modules(SQLITE3 sqlite3>=${sqlite_minimum_version})
+pkg_check_modules(SQLITE3 REQUIRED sqlite3>=${sqlite_minimum_version})
# ******************************
# Google flags
@@ -826,17 +826,17 @@ endif(libical_is_0_43)
# subparts flags
# ******************************
-pkg_check_modules(SOUP libsoup-2.4)
-pkg_check_modules(DATA_SERVER gio-2.0 gmodule-2.0 libsecret-1 libxml-2.0 libsoup-2.4 ${mozilla_nspr}
${mozilla_nss})
+pkg_check_modules(SOUP REQUIRED libsoup-2.4)
+pkg_check_modules(DATA_SERVER REQUIRED gio-2.0 gmodule-2.0 libsecret-1 libxml-2.0 libsoup-2.4
${mozilla_nspr} ${mozilla_nss})
set(E_DATA_SERVER_INCLUDES ${E_DATA_SERVER_INCLUDES} ${MANUAL_NSPR_INCLUDES} ${MANUAL_NSS_INCLUDES})
set(E_DATA_SERVER_LDFLAGS ${E_DATA_SERVER_LDFLAGS} ${MANUAL_NSPR_LIBS} ${MANUAL_NSS_LIBS})
-pkg_check_modules(BACKEND gio-2.0 gmodule-2.0 libsecret-1 libsoup-2.4 libxml-2.0)
-pkg_check_modules(ADDRESSBOOK gio-2.0 libxml-2.0 libsoup-2.4 libsecret-1)
-pkg_check_modules(CALENDAR gio-2.0 libical>=${libical_minimum_version} libsoup-2.4 libxml-2.0 libsecret-1)
+pkg_check_modules(BACKEND REQUIRED gio-2.0 gmodule-2.0 libsecret-1 libsoup-2.4 libxml-2.0)
+pkg_check_modules(ADDRESSBOOK REQUIRED gio-2.0 libxml-2.0 libsoup-2.4 libsecret-1)
+pkg_check_modules(CALENDAR REQUIRED gio-2.0 libical>=${libical_minimum_version} libsoup-2.4 libxml-2.0
libsecret-1)
set(CALENDAR_CFLAGS "${CALENDAR_CFLAGS} ${LIBICAL_EXTRA_CFLAGS}")
-pkg_check_modules(CAMEL gio-2.0 gmodule-2.0 ${mozilla_nss} ${mozilla_nspr}
sqlite3>=${sqlite_minimum_version})
+pkg_check_modules(CAMEL REQUIRED gio-2.0 gmodule-2.0 ${mozilla_nss} ${mozilla_nspr}
sqlite3>=${sqlite_minimum_version})
set(CAMEL_CFLAGS "${CAMEL_CFLAGS} ${KRB5_CFLAGS} ${MANUAL_NSS_CFLAGS} ${MANUAL_NSPR_CFLAGS} ${ICU_CFLAGS}")
set(CAMEL_LDFLAGS "${CAMEL_LDFLAGS} -lz ${KRB5_LDFLAGS} ${MANUAL_NSS_LIBS} ${MANUAL_NSPR_LIBS}
${ICU_LDFLAGS}")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]