"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "CMakeLists.txt" between
evolution-data-server-3.32.4.tar.xz and evolution-data-server-3.34.0.tar.xz

About: Evolution-Data-Server manages access to the calendar, tasks and addressbook information available for Evolution and other applications.

CMakeLists.txt  (evolution-data-server-3.32.4.tar.xz):CMakeLists.txt  (evolution-data-server-3.34.0.tar.xz)
# Evolution-Data-Server build script # Evolution-Data-Server build script
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.1)
cmake_policy(VERSION 3.1) cmake_policy(VERSION 3.1)
project(evolution-data-server project(evolution-data-server
VERSION 3.32.4 VERSION 3.34.0
LANGUAGES C CXX) LANGUAGES C CXX)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
set(PROJECT_BUGREPORT "https://gitlab.gnome.org/GNOME/evolution-data-server/issu es/") set(PROJECT_BUGREPORT "https://gitlab.gnome.org/GNOME/evolution-data-server/issu es/")
# Base Version: This is for API/version tracking for things like # Base Version: This is for API/version tracking for things like
# D-Bus server files. This should always be the major/minor of # D-Bus server files. This should always be the major/minor of
# the stable version or stable version to be. # the stable version or stable version to be.
set(BASE_VERSION 3.32) set(BASE_VERSION 3.34)
# This number is meaningless, but we're now stuck with it in our # This number is meaningless, but we're now stuck with it in our
# library names for backward compatibility. # library names for backward compatibility.
set(API_VERSION 1.2) set(API_VERSION 1.2)
# API version of the calendar part
set(CAL_API_VERSION 2.0)
# Required for FindIntltool module # Required for FindIntltool module
set(GETTEXT_PACKAGE ${PROJECT_NAME}) set(GETTEXT_PACKAGE ${PROJECT_NAME})
set(GETTEXT_PO_DIR ${CMAKE_SOURCE_DIR}/po) set(GETTEXT_PO_DIR ${CMAKE_SOURCE_DIR}/po)
# Required for 'disttest' and 'ditcheck' of DistTarget module # Required for 'disttest' and 'distcheck' of DistTarget module
set(PROJECT_DISTCONFIGURE_PARAMS set(PROJECT_DISTCONFIGURE_PARAMS
-DENABLE_GOA=ON -DENABLE_GOA=ON
-DENABLE_EXAMPLES=ON -DENABLE_EXAMPLES=ON
-DENABLE_INTROSPECTION=ON -DENABLE_INTROSPECTION=ON
-DENABLE_VALA_BINDINGS=ON -DENABLE_VALA_BINDINGS=ON
-DENABLE_INSTALLED_TESTS=ON -DENABLE_INSTALLED_TESTS=ON
-DENABLE_GTK_DOC=ON -DENABLE_GTK_DOC=ON
-DWITH_PRIVATE_DOCS=ON -DWITH_PRIVATE_DOCS=ON
) )
# ****************************** # ******************************
# D-Bus versioning # D-Bus versioning
# ****************************** # ******************************
# Actual name can be modified with DBUS_SERVICES_PREFIX option # Actual name can be modified with DBUS_SERVICES_PREFIX option
set(ADDRESS_BOOK_DBUS_SERVICE_NAME "org.gnome.evolution.dataserver.AddressBo set(ADDRESS_BOOK_DBUS_SERVICE_NAME "org.gnome.evolution.dataserver.AddressBo
ok9") ok10")
set(CALENDAR_DBUS_SERVICE_NAME "org.gnome.evolution.dataserver.Calendar7 set(CALENDAR_DBUS_SERVICE_NAME "org.gnome.evolution.dataserver.Calendar8
") ")
set(SOURCES_DBUS_SERVICE_NAME "org.gnome.evolution.dataserver.Sources5" ) set(SOURCES_DBUS_SERVICE_NAME "org.gnome.evolution.dataserver.Sources5" )
set(USER_PROMPTER_DBUS_SERVICE_NAME "org.gnome.evolution.dataserver.UserPromp ter0") set(USER_PROMPTER_DBUS_SERVICE_NAME "org.gnome.evolution.dataserver.UserPromp ter0")
# ****************************** # ******************************
# Library versioning # Library versioning
# ****************************** # ******************************
set(LIBCAMEL_CURRENT 62) set(LIBCAMEL_CURRENT 62)
set(LIBCAMEL_REVISION 0) set(LIBCAMEL_REVISION 0)
set(LIBCAMEL_AGE 0) set(LIBCAMEL_AGE 0)
skipping to change at line 64 skipping to change at line 67
set(LIBEBACKEND_AGE 0) set(LIBEBACKEND_AGE 0)
set(LIBEDATASERVER_CURRENT 24) set(LIBEDATASERVER_CURRENT 24)
set(LIBEDATASERVER_REVISION 0) set(LIBEDATASERVER_REVISION 0)
set(LIBEDATASERVER_AGE 0) set(LIBEDATASERVER_AGE 0)
set(LIBEDATASERVERUI_CURRENT 2) set(LIBEDATASERVERUI_CURRENT 2)
set(LIBEDATASERVERUI_REVISION 0) set(LIBEDATASERVERUI_REVISION 0)
set(LIBEDATASERVERUI_AGE 0) set(LIBEDATASERVERUI_AGE 0)
set(LIBEBOOK_CURRENT 19) set(LIBEBOOK_CURRENT 20)
set(LIBEBOOK_REVISION 1) set(LIBEBOOK_REVISION 1)
set(LIBEBOOK_AGE 3) set(LIBEBOOK_AGE 3)
set(LIBEBOOK_CONTACTS_CURRENT 2) set(LIBEBOOK_CONTACTS_CURRENT 3)
set(LIBEBOOK_CONTACTS_REVISION 0) set(LIBEBOOK_CONTACTS_REVISION 0)
set(LIBEBOOK_CONTACTS_AGE 0) set(LIBEBOOK_CONTACTS_AGE 0)
set(LIBEDATABOOK_CURRENT 25) set(LIBEDATABOOK_CURRENT 26)
set(LIBEDATABOOK_REVISION 0) set(LIBEDATABOOK_REVISION 0)
set(LIBEDATABOOK_AGE 0) set(LIBEDATABOOK_AGE 0)
set(LIBECAL_CURRENT 19) set(LIBECAL_CURRENT 1)
set(LIBECAL_REVISION 0) set(LIBECAL_REVISION 0)
set(LIBECAL_AGE 0) set(LIBECAL_AGE 0)
set(LIBEDATACAL_CURRENT 29) set(LIBEDATACAL_CURRENT 1)
set(LIBEDATACAL_REVISION 0) set(LIBEDATACAL_REVISION 0)
set(LIBEDATACAL_AGE 0) set(LIBEDATACAL_AGE 0)
# Keep these two definitions in agreement. # Keep these two definitions in agreement.
set(glib_minimum_version 2.46) set(glib_minimum_version 2.46)
set(glib_encoded_version GLIB_VERSION_2_46) set(glib_encoded_version GLIB_VERSION_2_46)
# Keep these two definitions in agreement. # Keep these two definitions in agreement.
set(gdk_minimum_version 3.10) set(gdk_minimum_version 3.10)
set(gdk_encoded_version GDK_VERSION_3_10) set(gdk_encoded_version GDK_VERSION_3_10)
skipping to change at line 111 skipping to change at line 114
# These will suppress warnings about newly-deprecated symbols. Ideally # These will suppress warnings about newly-deprecated symbols. Ideally
# these settings should match our minimum requirements and we will clean # these settings should match our minimum requirements and we will clean
# up any new deprecation warnings after bumping our minimum requirements. # up any new deprecation warnings after bumping our minimum requirements.
# But if the warnings get to be overwhelming, use fixed versions instead. # But if the warnings get to be overwhelming, use fixed versions instead.
add_definitions(-DGLIB_VERSION_MIN_REQUIRED=${glib_encoded_version}) add_definitions(-DGLIB_VERSION_MIN_REQUIRED=${glib_encoded_version})
add_definitions(-DGDK_VERSION_MIN_REQUIRED=${gdk_encoded_version}) add_definitions(-DGDK_VERSION_MIN_REQUIRED=${gdk_encoded_version})
add_definitions(-DSOUP_VERSION_MIN_REQUIRED=${soup_encoded_version}) add_definitions(-DSOUP_VERSION_MIN_REQUIRED=${soup_encoded_version})
set(gcr_minimum_version 3.4) set(gcr_minimum_version 3.4)
set(libgdata_minimum_version 0.15.1) set(libgdata_minimum_version 0.15.1)
set(libical_minimum_version 2.0) set(libical_glib_minimum_version 3.0.5)
set(libsecret_minimum_version 0.5) set(libsecret_minimum_version 0.5)
set(libxml_minimum_version 2.0.0) set(libxml_minimum_version 2.0.0)
set(sqlite_minimum_version 3.7.17) set(sqlite_minimum_version 3.7.17)
# Optional Packages # Optional Packages
set(goa_minimum_version 3.8) set(goa_minimum_version 3.8)
set(gweather_minimum_version 3.10) set(gweather_minimum_version 3.10)
set(libaccounts_glib_minimum_version 1.4) set(libaccounts_glib_minimum_version 1.4)
set(libsignon_glib_minimum_version 1.8) set(libsignon_glib_minimum_version 1.8)
set(json_glib_minimum_version 1.0.4) set(json_glib_minimum_version 1.0.4)
skipping to change at line 895 skipping to change at line 898
add_definitions(-D_LARGEFILE64_SOURCE=1) add_definitions(-D_LARGEFILE64_SOURCE=1)
elseif(NOT have_o_largefile_bare) elseif(NOT have_o_largefile_bare)
set(HAVE_O_LARGEFILE OFF) set(HAVE_O_LARGEFILE OFF)
endif() endif()
unset(CMAKE_REQUIRED_FLAGS) unset(CMAKE_REQUIRED_FLAGS)
else(ENABLE_LARGEFILE) else(ENABLE_LARGEFILE)
set(HAVE_O_LARGEFILE OFF) set(HAVE_O_LARGEFILE OFF)
endif(ENABLE_LARGEFILE) endif(ENABLE_LARGEFILE)
# ****************************** # ******************************
# libical tweaks, part I
# ******************************
pkg_check_at_least_version(HAVE_LIBICAL_2_0 libical 2.0)
# *****
# libical.pc from libical-0.43 has a bug in its CFlags.
# It wants apps to include <libical/ical*.h> but it's CFlags make it difficult
# to differentiate between <libical/ical.h> and <ical.h>
# We have fixed all our instances to use <libical/ical.h>.
# Work-around the buggy CFlags for the 0.43 version.
# *****
pkg_check_exact_version(libical_is_0_43 libical 0.43)
if(libical_is_0_43)
pkg_check_variable(LIBICAL_EXTRA_CFLAGS libical includedir)
endif(libical_is_0_43)
# ******************************
# subparts flags # subparts flags
# ****************************** # ******************************
pkg_check_modules(SOUP REQUIRED libsoup-2.4) 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}) 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} ${M ANUAL_NSS_INCLUDES}) set(E_DATA_SERVER_INCLUDES ${E_DATA_SERVER_INCLUDES} ${MANUAL_NSPR_INCLUDES} ${M ANUAL_NSS_INCLUDES})
set(E_DATA_SERVER_LDFLAGS ${E_DATA_SERVER_LDFLAGS} ${MANUAL_NSPR_LIBS} ${MANUAL_ NSS_LIBS}) set(E_DATA_SERVER_LDFLAGS ${E_DATA_SERVER_LDFLAGS} ${MANUAL_NSPR_LIBS} ${MANUAL_ NSS_LIBS})
pkg_check_modules(BACKEND REQUIRED gio-2.0 gmodule-2.0 libsecret-1 libsoup-2.4 l ibxml-2.0) pkg_check_modules(BACKEND REQUIRED gio-2.0 gmodule-2.0 libsecret-1 libsoup-2.4 l ibxml-2.0)
pkg_check_modules(ADDRESSBOOK REQUIRED gio-2.0 libxml-2.0 libsoup-2.4 libsecret- 1) 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) pkg_check_modules(CALENDAR REQUIRED gio-2.0 libical-glib>=${libical_glib_minimum _version} libsoup-2.4 libxml-2.0 libsecret-1)
set(ADDRESSBOOK_CFLAGS ${ADDRESSBOOK_CFLAGS} ${PHONENUMBER_DEFINITIONS}) set(ADDRESSBOOK_CFLAGS ${ADDRESSBOOK_CFLAGS} ${PHONENUMBER_DEFINITIONS})
set(ADDRESSBOOK_INCLUDE_DIRS ${ADDRESSBOOK_INCLUDE_DIRS} ${PHONENUMBER_INCLUDE_D IRS}) set(ADDRESSBOOK_INCLUDE_DIRS ${ADDRESSBOOK_INCLUDE_DIRS} ${PHONENUMBER_INCLUDE_D IRS})
set(ADDRESSBOOK_LDFLAGS ${ADDRESSBOOK_LDFLAGS} ${PHONENUMBER_LDFLAGS}) set(ADDRESSBOOK_LDFLAGS ${ADDRESSBOOK_LDFLAGS} ${PHONENUMBER_LDFLAGS})
set(CALENDAR_CFLAGS ${CALENDAR_CFLAGS} ${LIBICAL_EXTRA_CFLAGS}) set(CALENDAR_CFLAGS ${CALENDAR_CFLAGS} -DLIBICAL_GLIB_UNSTABLE_API=1)
pkg_check_modules(CAMEL REQUIRED gio-2.0 gmodule-2.0 ${mozilla_nss} ${mozilla_ns pr} sqlite3>=${sqlite_minimum_version}) pkg_check_modules(CAMEL REQUIRED gio-2.0 gmodule-2.0 ${mozilla_nss} ${mozilla_ns pr} sqlite3>=${sqlite_minimum_version})
set(CAMEL_CFLAGS ${CAMEL_CFLAGS} ${KRB5_CFLAGS} ${MANUAL_NSS_CFLAGS} ${MANUAL_NS PR_CFLAGS} ${ICU_CFLAGS}) set(CAMEL_CFLAGS ${CAMEL_CFLAGS} ${KRB5_CFLAGS} ${MANUAL_NSS_CFLAGS} ${MANUAL_NS PR_CFLAGS} ${ICU_CFLAGS})
set(CAMEL_LDFLAGS ${CAMEL_LDFLAGS} -lz ${KRB5_LDFLAGS} ${MANUAL_NSS_LIBS} ${MANU AL_NSPR_LIBS} ${ICU_LDFLAGS}) set(CAMEL_LDFLAGS ${CAMEL_LDFLAGS} -lz ${KRB5_LDFLAGS} ${MANUAL_NSS_LIBS} ${MANU AL_NSPR_LIBS} ${ICU_LDFLAGS})
if(NOT (MANUAL_NSPR_INCLUDES STREQUAL "")) if(NOT (MANUAL_NSPR_INCLUDES STREQUAL ""))
list(APPEND CAMEL_INCLUDE_DIRS ${MANUAL_NSPR_INCLUDES}) list(APPEND CAMEL_INCLUDE_DIRS ${MANUAL_NSPR_INCLUDES})
endif(NOT (MANUAL_NSPR_INCLUDES STREQUAL "")) endif(NOT (MANUAL_NSPR_INCLUDES STREQUAL ""))
if(NOT (MANUAL_NSS_INCLUDES STREQUAL "")) if(NOT (MANUAL_NSS_INCLUDES STREQUAL ""))
list(APPEND CAMEL_INCLUDE_DIRS ${MANUAL_NSS_INCLUDES}) list(APPEND CAMEL_INCLUDE_DIRS ${MANUAL_NSS_INCLUDES})
endif(NOT (MANUAL_NSS_INCLUDES STREQUAL "")) endif(NOT (MANUAL_NSS_INCLUDES STREQUAL ""))
# ****************************** # ******************************
# libical tweaks, part II (re-using CALENDAR modules)
# ******************************
set(CMAKE_REQUIRED_DEFINITIONS ${CALENDAR_CFLAGS_OTHER})
set(CMAKE_REQUIRED_INCLUDES ${CALENDAR_INCLUDE_DIRS})
set(CMAKE_REQUIRED_LIBRARIES ${CALENDAR_LDFLAGS})
CHECK_C_SOURCE_COMPILES("#include <libical/ical.h>
int main(void) {
ical_set_unknown_token_handling_setting (ICAL_DIS
CARD_TOKEN);
return 0;
}" HAVE_ICAL_UNKNOWN_TOKEN_HANDLING)
CHECK_C_SOURCE_COMPILES("#include <libical/ical.h>
int main(void) {
icaltzutil_set_exact_vtimezones_support (0);
return 0;
}" HAVE_ICALTZUTIL_SET_EXACT_VTIMEZONES_SUPPORT)
CHECK_C_SOURCE_COMPILES("#include <libical/ical.h>
int main(void) {
icalproperty_status_to_string (ICAL_STATUS_DELETE
D);
return 0;
}" HAVE_ICAL_STATUS_DELETED)
unset(CMAKE_REQUIRED_DEFINITIONS)
unset(CMAKE_REQUIRED_INCLUDES)
unset(CMAKE_REQUIRED_LIBRARIES)
# ******************************
# Vala binding # Vala binding
# ****************************** # ******************************
add_printable_option(ENABLE_VALA_BINDINGS "Build the experimental Vala bindings" OFF) add_printable_option(ENABLE_VALA_BINDINGS "Build the experimental Vala bindings" OFF)
if(ENABLE_VALA_BINDINGS) if(ENABLE_VALA_BINDINGS)
if(NOT ENABLE_INTROSPECTION) if(NOT ENABLE_INTROSPECTION)
message(FATAL_ERROR "Vala bindings require introspection generati on to be enabled, use -DENABLE_INTROSPECTION=ON to enable it, or disable Vala bi ndings with -DENABLE_VALA_BINDINGS=OFF") message(FATAL_ERROR "Vala bindings require introspection generati on to be enabled, use -DENABLE_INTROSPECTION=ON to enable it, or disable Vala bi ndings with -DENABLE_VALA_BINDINGS=OFF")
endif(NOT ENABLE_INTROSPECTION) endif(NOT ENABLE_INTROSPECTION)
 End of changes. 15 change blocks. 
65 lines changed or deleted 18 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)