[evolution-mapi] Bug 773659 - Don't set CFLAGS returned by pkg-config as CMAKE_REQUIRED_FLAGS
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-mapi] Bug 773659 - Don't set CFLAGS returned by pkg-config as CMAKE_REQUIRED_FLAGS
- Date: Mon, 31 Oct 2016 15:02:08 +0000 (UTC)
commit 2d03ed5b6248fddfead9a12ab8339bb34a03423f
Author: Milan Crha <mcrha redhat com>
Date: Mon Oct 31 16:02:00 2016 +0100
Bug 773659 - Don't set CFLAGS returned by pkg-config as CMAKE_REQUIRED_FLAGS
CMakeLists.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5e4bbc..eea2bbf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,7 +125,7 @@ pkg_check_modules(GNOME_PLATFORM REQUIRED
pkg_check_modules(LIBICAL REQUIRED libical)
pkg_check_modules(LIBMAPI REQUIRED libmapi>=${libmapi_minimum_version})
-set(CMAKE_REQUIRED_FLAGS ${LIBMAPI_INCLUDE_CFLAGS})
+set(CMAKE_REQUIRED_DEFINITIONS ${LIBMAPI_CFLAGS_OTHER})
set(CMAKE_REQUIRED_INCLUDES ${LIBMAPI_INCLUDE_DIRS})
set(CMAKE_REQUIRED_LIBRARIES ${LIBMAPI_LDFLAGS})
@@ -159,7 +159,7 @@ CHECK_C_SOURCE_COMPILES("#include <libmapi/libmapi.h>
CHECK_C_SOURCE_COMPILES("#include <libmapi/libmapi.h>
int main(void) { QueryRows(NULL, 1, TBL_ADVANCE, TBL_FORWARD_READ, NULL); return 0;
}" HAVE_QUERYROWS_FORWARDREAD)
-unset(CMAKE_REQUIRED_FLAGS)
+unset(CMAKE_REQUIRED_DEFINITIONS)
unset(CMAKE_REQUIRED_INCLUDES)
unset(CMAKE_REQUIRED_LIBRARIES)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]