libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update macOS atdna header includes for 10.13 SDK

This commit is contained in:
Jack Andersen 2017-08-24 20:17:03 -10:00
parent 38985326f3
commit 896de3833c
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
atdna/CMakeLists.txt
View File

@ -188,15 +188,16 @@ macro(atdna out)
list(APPEND extraargs -fms-compatibility-version=19.00) list(APPEND extraargs -fms-compatibility-version=19.00)
elseif(MSVC_VERSION EQUAL 1910) elseif(MSVC_VERSION EQUAL 1910)
list(APPEND extraargs -fms-compatibility-version=19.10) list(APPEND extraargs -fms-compatibility-version=19.10)
endif() endif()
# OSX Extra # OSX Extra
elseif(APPLE) elseif(APPLE)
if (NOT EXISTS "${CMAKE_OSX_SYSROOT}") if (NOT EXISTS "${CMAKE_OSX_SYSROOT}")
message(FATAL_ERROR "CMAKE_OSX_SYSROOT not set") message(FATAL_ERROR "CMAKE_OSX_SYSROOT not set")
endif() endif()
list(APPEND extraargs -isysroot ${CMAKE_OSX_SYSROOT} -I ${CMAKE_OSX_SYSROOT}/usr/include -isysroot list(APPEND extraargs -isysroot ${CMAKE_OSX_SYSROOT} -isysroot ${CMAKE_OSX_SYSROOT}/usr/include
${CMAKE_OSX_SYSROOT}/../../../../../Toolchains/XcodeDefault.xctoolchain) -I ${CMAKE_OSX_SYSROOT}/../../../../../Toolchains/XcodeDefault.xctoolchain
-I ${CMAKE_OSX_SYSROOT}/../../../../../Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1)
endif() endif()
# Make target # Make target

12
atdna/atdnaConfig.cmake.in
View File

@ -47,12 +47,18 @@ macro(atdna out)
list(APPEND extraargs -fms-compatibility-version=18.00) list(APPEND extraargs -fms-compatibility-version=18.00)
elseif(MSVC_VERSION EQUAL 1900) elseif(MSVC_VERSION EQUAL 1900)
list(APPEND extraargs -fms-compatibility-version=19.00) 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 # OSX Extra
elseif(APPLE) elseif(APPLE)
list(APPEND extraargs -isysroot ${CMAKE_OSX_SYSROOT} -isysroot if (NOT EXISTS "${CMAKE_OSX_SYSROOT}")
${CMAKE_OSX_SYSROOT}/../../../../../Toolchains/XcodeDefault.xctoolchain) 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() endif()
# Make target # Make target