From 896de3833c39e789a13635427e77ca971fec9c9d Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Thu, 24 Aug 2017 20:17:03 -1000 Subject: [PATCH] Update macOS atdna header includes for 10.13 SDK --- atdna/CMakeLists.txt | 7 ++++--- atdna/atdnaConfig.cmake.in | 12 +++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/atdna/CMakeLists.txt b/atdna/CMakeLists.txt index e3b4397..c46ee5d 100644 --- a/atdna/CMakeLists.txt +++ b/atdna/CMakeLists.txt @@ -188,15 +188,16 @@ macro(atdna out) list(APPEND extraargs -fms-compatibility-version=19.00) elseif(MSVC_VERSION EQUAL 1910) list(APPEND extraargs -fms-compatibility-version=19.10) - endif() + endif() # OSX Extra elseif(APPLE) if (NOT EXISTS "${CMAKE_OSX_SYSROOT}") message(FATAL_ERROR "CMAKE_OSX_SYSROOT not set") endif() - list(APPEND extraargs -isysroot ${CMAKE_OSX_SYSROOT} -I ${CMAKE_OSX_SYSROOT}/usr/include -isysroot - ${CMAKE_OSX_SYSROOT}/../../../../../Toolchains/XcodeDefault.xctoolchain) + list(APPEND extraargs -isysroot ${CMAKE_OSX_SYSROOT} -isysroot ${CMAKE_OSX_SYSROOT}/usr/include + -I ${CMAKE_OSX_SYSROOT}/../../../../../Toolchains/XcodeDefault.xctoolchain + -I ${CMAKE_OSX_SYSROOT}/../../../../../Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1) endif() # Make target diff --git a/atdna/atdnaConfig.cmake.in b/atdna/atdnaConfig.cmake.in index 5ffad07..f13ff8d 100644 --- a/atdna/atdnaConfig.cmake.in +++ b/atdna/atdnaConfig.cmake.in @@ -47,12 +47,18 @@ macro(atdna out) list(APPEND extraargs -fms-compatibility-version=18.00) elseif(MSVC_VERSION EQUAL 1900) list(APPEND extraargs -fms-compatibility-version=19.00) - endif() + elseif(MSVC_VERSION EQUAL 1910) + list(APPEND extraargs -fms-compatibility-version=19.10) + endif() # OSX Extra elseif(APPLE) - list(APPEND extraargs -isysroot ${CMAKE_OSX_SYSROOT} -isysroot - ${CMAKE_OSX_SYSROOT}/../../../../../Toolchains/XcodeDefault.xctoolchain) + if (NOT EXISTS "${CMAKE_OSX_SYSROOT}") + message(FATAL_ERROR "CMAKE_OSX_SYSROOT not set") + endif() + list(APPEND extraargs -isysroot ${CMAKE_OSX_SYSROOT} -isysroot ${CMAKE_OSX_SYSROOT}/usr/include + -I ${CMAKE_OSX_SYSROOT}/../../../../../Toolchains/XcodeDefault.xctoolchain + -I ${CMAKE_OSX_SYSROOT}/../../../../../Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1) endif() # Make target