diff options
| author | Stefan Zellmann <info@szellmann.de> | 2016-04-17 12:08:49 +0000 |
|---|---|---|
| committer | Stefan Zellmann <info@szellmann.de> | 2016-04-17 12:08:49 +0000 |
| commit | d1a32d975024c9c5597d6efa79ec451c89385795 (patch) | |
| tree | 58fdeb41cd49536b849ce2aa1bc7732c321e6d16 | |
| parent | merge Moritz's branch (diff) | |
| download | inkscape-d1a32d975024c9c5597d6efa79ec451c89385795.tar.gz inkscape-d1a32d975024c9c5597d6efa79ec451c89385795.zip | |
OS X Xcode clang 7.0.2 compile fix
Have no <tr1/XXX> STL headers w/ OS X clang so try to find the C++11 ones
(bzr r14855.1.1)
| -rw-r--r-- | CMakeScripts/ConfigChecks.cmake | 2 | ||||
| -rw-r--r-- | config.h.cmake | 3 |
2 files changed, 5 insertions, 0 deletions
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 <unistd.h> header file. */ #cmakedefine HAVE_UNISTD_H 1 +/* Define to 1 if you have the <unordered_set> header file. */ +#cmakedefine HAVE_NATIVE_UNORDERED_SET 1 + /* Define to 1 if you have the <zlib.h> header file. */ #cmakedefine HAVE_ZLIB_H 1 |