[evolution/wip/camel-more-gobject] Do not quote compiler/linker flags
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/camel-more-gobject] Do not quote compiler/linker flags
- Date: Tue, 18 Oct 2016 10:08:51 +0000 (UTC)
commit 60daa525cc1833f35f35eae2ee7de6e0926bc31a
Author: Milan Crha <mcrha redhat com>
Date: Tue Oct 18 11:57:42 2016 +0200
Do not quote compiler/linker flags
(cherry picked from commit 2025db51e8cdaea69dbdb4b1ee76f5625b0d520d)
CMakeLists.txt | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77853af..b62ebb9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -507,8 +507,8 @@ 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}")
-set(CERT_UI_LIBS "${MANUAL_NSPR_LIBS}")
+set(CERT_UI_INCLUDES ${MANUAL_NSPR_INCLUDES})
+set(CERT_UI_LIBS ${MANUAL_NSPR_LIBS})
# ******************************
# Libnotify
@@ -521,9 +521,9 @@ set(HAVE_LIBNOTIFY ${LIBNOTIFY_FOUND})
# libical tweaks
# ******************************
-set(CMAKE_REQUIRED_FLAGS "${EVOLUTION_DATA_SERVER_CFLAGS}")
-set(CMAKE_REQUIRED_INCLUDES "${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}")
-set(CMAKE_REQUIRED_LIBRARIES "${EVOLUTION_DATA_SERVER_LDFLAGS}")
+set(CMAKE_REQUIRED_FLAGS ${EVOLUTION_DATA_SERVER_CFLAGS})
+set(CMAKE_REQUIRED_INCLUDES ${EVOLUTION_DATA_SERVER_INCLUDE_DIRS})
+set(CMAKE_REQUIRED_LIBRARIES ${EVOLUTION_DATA_SERVER_LDFLAGS})
CHECK_C_SOURCE_COMPILES("#include <libical/ical.h>
int main(void) {
@@ -538,6 +538,7 @@ CHECK_C_SOURCE_COMPILES("#include <libical/ical.h>
}" HAVE_ICALTZUTIL_SET_EXACT_VTIMEZONES_SUPPORT)
unset(CMAKE_REQUIRED_FLAGS)
+unset(CMAKE_REQUIRED_INCLUDES)
unset(CMAKE_REQUIRED_LIBRARIES)
# ******************************
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]