From be9469d568aa20f34574107bf70f8f730d2575eb Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Fri, 13 Sep 2019 17:07:55 +0300 Subject: [PATCH 1/5] Add 'ios-12-3-dep-9-3-arm64' --- bin/detail/toolchain_table.py | 1 + ios-12-3-dep-9-3-arm64.cmake | 42 +++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 ios-12-3-dep-9-3-arm64.cmake diff --git a/bin/detail/toolchain_table.py b/bin/detail/toolchain_table.py index bcaecdcb..e484b8f6 100644 --- a/bin/detail/toolchain_table.py +++ b/bin/detail/toolchain_table.py @@ -507,6 +507,7 @@ 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'), diff --git a/ios-12-3-dep-9-3-arm64.cmake b/ios-12-3-dep-9-3-arm64.cmake new file mode 100644 index 00000000..b2af85c1 --- /dev/null +++ b/ios-12-3-dep-9-3-arm64.cmake @@ -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") From a11cb74ead34d9795752f790358820340ff0444e Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Tue, 17 Sep 2019 19:21:26 +0300 Subject: [PATCH 2/5] Add 'ios-12-1-dep-9-3-arm64-bitcode' toolchain --- bin/detail/toolchain_table.py | 1 + ios-12-1-dep-9-3-arm64-bitcode.cmake | 44 ++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 ios-12-1-dep-9-3-arm64-bitcode.cmake diff --git a/bin/detail/toolchain_table.py b/bin/detail/toolchain_table.py index e484b8f6..63128b46 100644 --- a/bin/detail/toolchain_table.py +++ b/bin/detail/toolchain_table.py @@ -514,6 +514,7 @@ def verify(self): 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'), diff --git a/ios-12-1-dep-9-3-arm64-bitcode.cmake b/ios-12-1-dep-9-3-arm64-bitcode.cmake new file mode 100644 index 00000000..19deb423 --- /dev/null +++ b/ios-12-1-dep-9-3-arm64-bitcode.cmake @@ -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") From e0bf92c249234cd5bcbf3fdfdfd6bbe9a463a50f Mon Sep 17 00:00:00 2001 From: jbzdarkid Date: Mon, 23 Sep 2019 14:51:21 -0700 Subject: [PATCH 3/5] Basic XCode 15 support --- bin/detail/toolchain_table.py | 2 ++ osx-10-15-dep-10-12-cxx17.cmake | 29 +++++++++++++++++++++++++++++ osx-10-15.cmake | 29 +++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 osx-10-15-dep-10-12-cxx17.cmake create mode 100644 osx-10-15.cmake diff --git a/bin/detail/toolchain_table.py b/bin/detail/toolchain_table.py index 63128b46..60285a67 100644 --- a/bin/detail/toolchain_table.py +++ b/bin/detail/toolchain_table.py @@ -725,6 +725,8 @@ 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-12-cxx17', 'Xcode', osx_version='10.15'), Toolchain('linux-gcc-x64', 'Unix Makefiles'), ] diff --git a/osx-10-15-dep-10-12-cxx17.cmake b/osx-10-15-dep-10-12-cxx17.cmake new file mode 100644 index 00000000..6f24f581 --- /dev/null +++ b/osx-10-15-dep-10-12-cxx17.cmake @@ -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") diff --git a/osx-10-15.cmake b/osx-10-15.cmake new file mode 100644 index 00000000..2961b591 --- /dev/null +++ b/osx-10-15.cmake @@ -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") From 30f5ab21f38c6e88bf13009dd467ac26ef653e51 Mon Sep 17 00:00:00 2001 From: jbzdarkid Date: Mon, 23 Sep 2019 14:59:41 -0700 Subject: [PATCH 4/5] 10.10 support, too --- bin/detail/toolchain_table.py | 3 +++ osx-10-15-dep-10-10-cxx14.cmake | 29 +++++++++++++++++++++++++++++ osx-10-15-dep-10-10-cxx17.cmake | 29 +++++++++++++++++++++++++++++ osx-10-15-dep-10-10.cmake | 29 +++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+) create mode 100644 osx-10-15-dep-10-10-cxx14.cmake create mode 100644 osx-10-15-dep-10-10-cxx17.cmake create mode 100644 osx-10-15-dep-10-10.cmake diff --git a/bin/detail/toolchain_table.py b/bin/detail/toolchain_table.py index 60285a67..0083eded 100644 --- a/bin/detail/toolchain_table.py +++ b/bin/detail/toolchain_table.py @@ -726,6 +726,9 @@ def verify(self): 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'), ] diff --git a/osx-10-15-dep-10-10-cxx14.cmake b/osx-10-15-dep-10-10-cxx14.cmake new file mode 100644 index 00000000..0ecb4dde --- /dev/null +++ b/osx-10-15-dep-10-10-cxx14.cmake @@ -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") diff --git a/osx-10-15-dep-10-10-cxx17.cmake b/osx-10-15-dep-10-10-cxx17.cmake new file mode 100644 index 00000000..439ea66c --- /dev/null +++ b/osx-10-15-dep-10-10-cxx17.cmake @@ -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") diff --git a/osx-10-15-dep-10-10.cmake b/osx-10-15-dep-10-10.cmake new file mode 100644 index 00000000..1c134c0e --- /dev/null +++ b/osx-10-15-dep-10-10.cmake @@ -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") From 2fc661a449162c8c3a505aec39d2280ce818cca0 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Tue, 24 Sep 2019 10:39:33 +0300 Subject: [PATCH 5/5] Add 'android-ndk-r18b-api-28-arm64-v8a-clang-libcxx11' --- ...r18b-api-28-arm64-v8a-clang-libcxx11.cmake | 33 +++++++++++++++++++ bin/detail/toolchain_table.py | 1 + 2 files changed, 34 insertions(+) create mode 100644 android-ndk-r18b-api-28-arm64-v8a-clang-libcxx11.cmake diff --git a/android-ndk-r18b-api-28-arm64-v8a-clang-libcxx11.cmake b/android-ndk-r18b-api-28-arm64-v8a-clang-libcxx11.cmake new file mode 100644 index 00000000..593b4dd6 --- /dev/null +++ b/android-ndk-r18b-api-28-arm64-v8a-clang-libcxx11.cmake @@ -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") diff --git a/bin/detail/toolchain_table.py b/bin/detail/toolchain_table.py index 0083eded..83231057 100644 --- a/bin/detail/toolchain_table.py +++ b/bin/detail/toolchain_table.py @@ -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'),