Skip to content

Commit

Permalink
Merge pull request ruslo#2 from cpp-pm/update_093019
Browse files Browse the repository at this point in the history
Polly update 09-30-2019
  • Loading branch information
bkotzz authored Oct 1, 2019
2 parents 48d8793 + e70c77d commit 8cb1833
Show file tree
Hide file tree
Showing 9 changed files with 272 additions and 0 deletions.
33 changes: 33 additions & 0 deletions android-ndk-r18b-api-28-arm64-v8a-clang-libcxx11.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Copyright (c) 2015-2018, Ruslan Baratov
# Copyright (c) 2017-2018, Robert Nitsch
# Copyright (c) 2018, David Hirvonen
# All rights reserved.

if(DEFINED POLLY_ANDROID_NDK_R18b_API_28_ARM64_V8A_CLANG_LIBCXX11_CMAKE_)
return()
else()
set(POLLY_ANDROID_NDK_R18b_API_28_ARM64_V8A_CLANG_LIBCXX11_CMAKE_ 1)
endif()

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.cmake")

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")

set(ANDROID_NDK_VERSION "r18b")
set(CMAKE_SYSTEM_VERSION "28")
set(CMAKE_ANDROID_ARCH_ABI "arm64-v8a")
set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION "clang")
set(CMAKE_ANDROID_STL_TYPE "c++_static") # LLVM libc++ static

polly_init(
"Android NDK ${ANDROID_NDK_VERSION} / \
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
Clang / c++11 support / libc++ static"
"Unix Makefiles"
)

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")

include("${CMAKE_CURRENT_LIST_DIR}/flags/cxx11.cmake") # before toolchain!

include("${CMAKE_CURRENT_LIST_DIR}/os/android.cmake")
8 changes: 8 additions & 0 deletions bin/detail/toolchain_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ def verify(self):
Toolchain('android-ndk-r17-api-19-armeabi-v7a-neon-clang-libcxx', 'Unix Makefiles'),
Toolchain('android-ndk-r18-api-24-arm64-v8a-clang-libcxx14', 'Unix Makefiles'),
Toolchain('android-ndk-r18b-api-24-arm64-v8a-clang-libcxx11', 'Unix Makefiles'),
Toolchain('android-ndk-r18b-api-28-arm64-v8a-clang-libcxx11', 'Unix Makefiles'),
Toolchain('android-ndk-r18b-api-16-armeabi-v7a-clang-libcxx', 'Unix Makefiles'),
Toolchain('android-ndk-r18b-api-21-arm64-v8a-clang-libcxx', 'Unix Makefiles'),
Toolchain('android-ndk-r18b-api-21-armeabi-v7a-clang-libcxx', 'Unix Makefiles'),
Expand Down Expand Up @@ -507,12 +508,14 @@ def verify(self):
if platform.system() == 'Darwin':
toolchain_table += [
Toolchain('ios', 'Xcode'),
Toolchain('ios-12-3-dep-9-3-arm64', 'Xcode', ios_version='12.3'),
Toolchain('ios-12-2-dep-9-3-arm64', 'Xcode', ios_version='12.2'),
Toolchain('ios-12-1-dep-9-0-device-bitcode-cxx14', 'Xcode', ios_version='12.1'),
Toolchain('ios-12-1-dep-9-0-device-bitcode-cxx17', 'Xcode', ios_version='12.1'),
Toolchain('ios-12-0-dep-11-0-arm64', 'Xcode', ios_version='12.0'),
Toolchain('ios-12-1-dep-11-0-arm64', 'Xcode', ios_version='12.1'),
Toolchain('ios-12-1-dep-12-0-arm64-cxx17', 'Xcode', ios_version='12.1'),
Toolchain('ios-12-1-dep-9-3-arm64-bitcode', 'Xcode', ios_version='12.1'),
Toolchain('ios-12-1-dep-9-3-arm64', 'Xcode', ios_version='12.1'),
Toolchain('ios-12-1-dep-9-3-armv7', 'Xcode', ios_version='12.1'),
Toolchain('ios-12-1-dep-9-3', 'Xcode', ios_version='12.1'),
Expand Down Expand Up @@ -723,6 +726,11 @@ def verify(self):
Toolchain('osx-10-14-dep-10-12-cxx17', 'Xcode', osx_version='10.14'),
Toolchain('osx-10-14-cxx14', 'Xcode', osx_version='10.14'),
Toolchain('osx-10-14-cxx17', 'Xcode', osx_version='10.14'),
Toolchain('osx-10-15', 'Xcode', osx_version='10.15'),
Toolchain('osx-10-15-dep-10-10', 'Xcode', osx_version='10.15'),
Toolchain('osx-10-15-dep-10-10-cxx14', 'Xcode', osx_version='10.15'),
Toolchain('osx-10-15-dep-10-10-cxx17', 'Xcode', osx_version='10.15'),
Toolchain('osx-10-15-dep-10-12-cxx17', 'Xcode', osx_version='10.15'),
Toolchain('linux-gcc-x64', 'Unix Makefiles'),
]

Expand Down
44 changes: 44 additions & 0 deletions ios-12-1-dep-9-3-arm64-bitcode.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Copyright (c) 2017-2018, Ruslan Baratov
# All rights reserved.

if(DEFINED POLLY_IOS_12_1_DEP_9_3_ARM64_BITCODE_CMAKE_)
return()
else()
set(POLLY_IOS_12_1_DEP_9_3_ARM64_BITCODE_CMAKE_ 1)
endif()

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.cmake")

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")

set(IOS_SDK_VERSION 12.1)
set(IOS_DEPLOYMENT_SDK_VERSION 9.3)

set(POLLY_XCODE_COMPILER "clang")
polly_init(
"iOS ${IOS_SDK_VERSION} / Deployment ${IOS_DEPLOYMENT_SDK_VERSION} / arm64 / \
${POLLY_XCODE_COMPILER} / \
bitcode / \
c++14 support"
"Xcode"
)

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")

include(polly_fatal_error)

# Fix try_compile
include(polly_ios_bundle_identifier)

set(CMAKE_MACOSX_BUNDLE YES)
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer")

set(IPHONEOS_ARCHS arm64)
set(IPHONESIMULATOR_ARCHS "")

include("${CMAKE_CURRENT_LIST_DIR}/compiler/xcode.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/os/iphone.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/flags/cxx14.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/flags/bitcode.cmake") # after os/iphone.cmake

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_ios_development_team.cmake")
42 changes: 42 additions & 0 deletions ios-12-3-dep-9-3-arm64.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Copyright (c) 2017-2018, Ruslan Baratov
# All rights reserved.

if(DEFINED POLLY_IOS_12_3_DEP_9_3_ARM64_CMAKE_)
return()
else()
set(POLLY_IOS_12_3_DEP_9_3_ARM64_CMAKE_ 1)
endif()

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.cmake")

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")

set(IOS_SDK_VERSION 12.3)
set(IOS_DEPLOYMENT_SDK_VERSION 9.3)

set(POLLY_XCODE_COMPILER "clang")
polly_init(
"iOS ${IOS_SDK_VERSION} / Deployment ${IOS_DEPLOYMENT_SDK_VERSION} / arm64 / \
${POLLY_XCODE_COMPILER} / \
c++14 support"
"Xcode"
)

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")

include(polly_fatal_error)

# Fix try_compile
include(polly_ios_bundle_identifier)

set(CMAKE_MACOSX_BUNDLE YES)
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer")

set(IPHONEOS_ARCHS arm64)
set(IPHONESIMULATOR_ARCHS "")

include("${CMAKE_CURRENT_LIST_DIR}/compiler/xcode.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/os/iphone.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/flags/cxx14.cmake")

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_ios_development_team.cmake")
29 changes: 29 additions & 0 deletions osx-10-15-dep-10-10-cxx14.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Copyright (c) 2016, Ruslan Baratov
# All rights reserved.

if(DEFINED POLLY_OSX_10_15_DEP_10_10_CXX14_CMAKE_)
return()
else()
set(POLLY_OSX_10_15_DEP_10_10_CXX14_CMAKE_ 1)
endif()

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")

set(OSX_SDK_VERSION "10.15")
set(POLLY_XCODE_COMPILER "clang")
polly_init(
"Xcode (OS X ${OSX_SDK_VERSION} | Deployment 10.10) / \
${POLLY_XCODE_COMPILER} / \
LLVM Standard C++ Library (libc++) / c++14 support"
"Xcode"
)

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")

include("${CMAKE_CURRENT_LIST_DIR}/compiler/xcode.cmake")

set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "OS X Deployment target" FORCE)

include("${CMAKE_CURRENT_LIST_DIR}/library/std/libcxx.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/flags/cxx14.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/os/osx.cmake")
29 changes: 29 additions & 0 deletions osx-10-15-dep-10-10-cxx17.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Copyright (c) 2016, Ruslan Baratov
# All rights reserved.

if(DEFINED POLLY_OSX_10_15_DEP_10_10_CXX17_CMAKE_)
return()
else()
set(POLLY_OSX_10_15_DEP_10_10_CXX17_CMAKE_ 1)
endif()

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")

set(OSX_SDK_VERSION "10.15")
set(POLLY_XCODE_COMPILER "clang")
polly_init(
"Xcode (OS X ${OSX_SDK_VERSION} | Deployment 10.10) / \
${POLLY_XCODE_COMPILER} / \
LLVM Standard C++ Library (libc++) / c++17 support"
"Xcode"
)

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")

include("${CMAKE_CURRENT_LIST_DIR}/compiler/xcode.cmake")

set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "OS X Deployment target" FORCE)

include("${CMAKE_CURRENT_LIST_DIR}/library/std/libcxx.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/flags/cxx17.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/os/osx.cmake")
29 changes: 29 additions & 0 deletions osx-10-15-dep-10-10.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Copyright (c) 2016, Ruslan Baratov
# All rights reserved.

if(DEFINED POLLY_OSX_10_15_DEP_10_10_CMAKE_)
return()
else()
set(POLLY_OSX_10_15_DEP_10_10_CMAKE_ 1)
endif()

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")

set(OSX_SDK_VERSION "10.15")
set(POLLY_XCODE_COMPILER "clang")
polly_init(
"Xcode (OS X ${OSX_SDK_VERSION} | Deployment 10.10) / \
${POLLY_XCODE_COMPILER} / \
LLVM Standard C++ Library (libc++) / c++11 support"
"Xcode"
)

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")

include("${CMAKE_CURRENT_LIST_DIR}/compiler/xcode.cmake")

set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "OS X Deployment target" FORCE)

include("${CMAKE_CURRENT_LIST_DIR}/library/std/libcxx.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/flags/cxx11.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/os/osx.cmake")
29 changes: 29 additions & 0 deletions osx-10-15-dep-10-12-cxx17.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Copyright (c) 2016, Ruslan Baratov
# All rights reserved.

if(DEFINED POLLY_OSX_10_15_DEP_10_12_CXX17_CMAKE_)
return()
else()
set(POLLY_OSX_10_15_DEP_10_12_CXX17_CMAKE_ 1)
endif()

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")

set(OSX_SDK_VERSION "10.15")
set(POLLY_XCODE_COMPILER "clang")
polly_init(
"Xcode (OS X ${OSX_SDK_VERSION} | Deployment 10.12) / \
${POLLY_XCODE_COMPILER} / \
LLVM Standard C++ Library (libc++) / c++17 support"
"Xcode"
)

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")

include("${CMAKE_CURRENT_LIST_DIR}/compiler/xcode.cmake")

set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "OS X Deployment target" FORCE)

include("${CMAKE_CURRENT_LIST_DIR}/library/std/libcxx.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/flags/cxx17.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/os/osx.cmake")
29 changes: 29 additions & 0 deletions osx-10-15.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Copyright (c) 2018, Ruslan Baratov
# All rights reserved.

if(DEFINED POLLY_OSX_10_15_CMAKE_)
return()
else()
set(POLLY_OSX_10_15_CMAKE_ 1)
endif()

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")

set(OSX_SDK_VERSION "10.15")
set(POLLY_XCODE_COMPILER "clang")
polly_init(
"Xcode (OS X ${OSX_SDK_VERSION}) / \
${POLLY_XCODE_COMPILER} / \
LLVM Standard C++ Library (libc++) / c++11 support"
"Xcode"
)

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")

include("${CMAKE_CURRENT_LIST_DIR}/compiler/xcode.cmake")

set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "OS X Deployment target" FORCE)

include("${CMAKE_CURRENT_LIST_DIR}/library/std/libcxx.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/flags/cxx11.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/os/osx.cmake")

0 comments on commit 8cb1833

Please sign in to comment.