From d1a32d975024c9c5597d6efa79ec451c89385795 Mon Sep 17 00:00:00 2001 From: Stefan Zellmann Date: Sun, 17 Apr 2016 14:08:49 +0200 Subject: OS X Xcode clang 7.0.2 compile fix Have no STL headers w/ OS X clang so try to find the C++11 ones (bzr r14855.1.1) --- CMakeScripts/ConfigChecks.cmake | 2 ++ config.h.cmake | 3 +++ 2 files changed, 5 insertions(+) diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake index a247f4e72..3d986d8dd 100644 --- a/CMakeScripts/ConfigChecks.cmake +++ b/CMakeScripts/ConfigChecks.cmake @@ -59,6 +59,8 @@ CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H) CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H) CHECK_INCLUDE_FILES(zlib.h HAVE_ZLIB_H) +CHECK_INCLUDE_FILE_CXX(unordered_set HAVE_NATIVE_UNORDERED_SET) + # Enable pango defines, necessary for compilation on Win32, how about Linux? # yes but needs to be done a better way if(HAVE_CAIRO_PDF) diff --git a/config.h.cmake b/config.h.cmake index a63768f74..3471caadf 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -237,6 +237,9 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_UNISTD_H 1 +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_NATIVE_UNORDERED_SET 1 + /* Define to 1 if you have the header file. */ #cmakedefine HAVE_ZLIB_H 1 -- cgit v1.2.3