[evolution-data-server] Do not quote compiler/linker flags and fix g-ir-scanner cflags

[Milan Crha <mcrha src gnome org>]

commit 50e1bc3726c57270d3436dde03bfcb705b07577d
Author: Milan Crha <mcrha redhat com>
Date:   Tue Oct 18 11:39:51 2016 +0200

    Do not quote compiler/linker flags and fix g-ir-scanner cflags

 CMakeLists.txt                                   |   13 +++++--------
 src/addressbook/libebook-contacts/CMakeLists.txt |    3 ++-
 src/addressbook/libebook/CMakeLists.txt          |    3 ++-
 src/camel/CMakeLists.txt                         |    2 +-
 src/libedataserver/CMakeLists.txt                |    4 ++--
 5 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26e9a1e..2c4778b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -848,21 +848,18 @@ set(E_DATA_SERVER_LDFLAGS ${E_DATA_SERVER_LDFLAGS} ${MANUAL_NSPR_LIBS} ${MANUAL_
 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}")
+set(CALENDAR_CFLAGS ${CALENDAR_CFLAGS} ${LIBICAL_EXTRA_CFLAGS})
 
 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}")
-
-string(STRIP "${CAMEL_CFLAGS}" CAMEL_CFLAGS)
-string(STRIP "${CAMEL_LDFLAGS}" CAMEL_LDFLAGS)
+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})
 
 # ******************************
 # libical tweaks, part II (re-using CALENDAR_CFLAGS/CALENDAR_LDFLAGS)
 # ******************************
 
-set(CMAKE_REQUIRED_FLAGS "${CALENDAR_CFLAGS}")
-set(CMAKE_REQUIRED_LIBRARIES "${CALENDAR_LDFLAGS}")
+set(CMAKE_REQUIRED_FLAGS ${CALENDAR_CFLAGS})
+set(CMAKE_REQUIRED_LIBRARIES ${CALENDAR_LDFLAGS})
 
 CHECK_C_SOURCE_COMPILES("#include <libical/ical.h>
                        int main(void) {
diff --git a/src/addressbook/libebook-contacts/CMakeLists.txt 
b/src/addressbook/libebook-contacts/CMakeLists.txt
index 3d8ace9..44c0081 100644
--- a/src/addressbook/libebook-contacts/CMakeLists.txt
+++ b/src/addressbook/libebook-contacts/CMakeLists.txt
@@ -132,7 +132,8 @@ set(gir_sources ${SOURCES} ${HEADERS})
 set(gir_identifies_prefixes E)
 set(gir_includes GObject-2.0 GLib-2.0 Gio-2.0 libxml2-2.0)
 set(gir_cflags
-       ${CAMEL_CFLAGS} ${DATA_SERVER_CFLAGS}
+       ${CAMEL_INCLUDE_DIRS}
+       ${DATA_SERVER_INCLUDE_DIRS}
        -DLIBEBOOK_CONTACTS_COMPILATION
        -I${CMAKE_BINARY_DIR}/src/addressbook
        -I${CMAKE_BINARY_DIR}/src/addressbook/libebook-contacts
diff --git a/src/addressbook/libebook/CMakeLists.txt b/src/addressbook/libebook/CMakeLists.txt
index c697b6f..6b54e0d 100644
--- a/src/addressbook/libebook/CMakeLists.txt
+++ b/src/addressbook/libebook/CMakeLists.txt
@@ -92,7 +92,8 @@ set(gir_sources ${SOURCES} ${HEADERS})
 set(gir_identifies_prefixes E)
 set(gir_includes GObject-2.0 GLib-2.0 Gio-2.0 libxml2-2.0)
 set(gir_cflags
-       ${CAMEL_CFLAGS} ${DATA_SERVER_CFLAGS}
+       ${CAMEL_INCLUDE_DIRS}
+       ${DATA_SERVER_INCLUDE_DIRS}
        -DLIBEBOOK_COMPILATION
        -I${CMAKE_BINARY_DIR}/src/addressbook
        -I${CMAKE_BINARY_DIR}/src/addressbook/libebook
diff --git a/src/camel/CMakeLists.txt b/src/camel/CMakeLists.txt
index 6e7ea43..419a276 100644
--- a/src/camel/CMakeLists.txt
+++ b/src/camel/CMakeLists.txt
@@ -311,7 +311,7 @@ add_pkgconfig_file(camel.pc.in camel-${API_VERSION}.pc)
 set(gir_sources ${SOURCES} ${HEADERS})
 set(gir_identifies_prefixes Camel camel)
 set(gir_includes GObject-2.0 Gio-2.0 libxml2-2.0)
-set(gir_cflags ${CAMEL_CFLAGS} -DCAMEL_COMPILATION)
+set(gir_cflags ${CAMEL_INCLUDE_DIRS} -DCAMEL_COMPILATION)
 set(gir_libdirs)
 set(gir_libs camel)
 set(gir_deps)
diff --git a/src/libedataserver/CMakeLists.txt b/src/libedataserver/CMakeLists.txt
index 517f7e2..e7edf15 100644
--- a/src/libedataserver/CMakeLists.txt
+++ b/src/libedataserver/CMakeLists.txt
@@ -265,8 +265,8 @@ set(gir_sources ${SOURCES} ${HEADERS})
 set(gir_identifies_prefixes E)
 set(gir_includes GObject-2.0 Gio-2.0 Soup-2.4 libxml2-2.0)
 set(gir_cflags
-       ${CAMEL_CFLAGS}
-       ${DATA_SERVER_CFLAGS}
+       ${CAMEL_INCLUDE_DIRS}
+       ${DATA_SERVER_INCLUDE_DIRS}
        -DLIBEDATASERVER_COMPILATION
 )
 set(gir_libdirs