Skip to content

Commit 946362f

Browse files
authoredSep 21, 2021
Merge pull request conan-io#9643 from czoido/add_support-for-xcode-13
Add support for Xcode 13
2 parents 4172839 + 2c2ec85 commit 946362f

File tree

2 files changed

+121
-2
lines changed

2 files changed

+121
-2
lines changed
 

‎conans/client/conf/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23]
102102
runtime: [None, MD, MT, MTd, MDd]
103103
apple-clang: &apple_clang
104-
version: ["5.0", "5.1", "6.0", "6.1", "7.0", "7.3", "8.0", "8.1", "9.0", "9.1", "10.0", "11.0", "12.0"]
104+
version: ["5.0", "5.1", "6.0", "6.1", "7.0", "7.3", "8.0", "8.1", "9.0", "9.1", "10.0", "11.0", "12.0", "13.0"]
105105
libcxx: [libstdc++, libc++]
106106
cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20]
107107
intel:

‎conans/client/migrations_settings.py

+120-1
Original file line numberDiff line numberDiff line change
@@ -2433,4 +2433,123 @@
24332433

24342434
settings_1_40_1 = settings_1_40_0
24352435

2436-
settings_1_40_2 = settings_1_40_1
2436+
settings_1_40_2 = """
2437+
# Only for cross building, 'os_build/arch_build' is the system that runs Conan
2438+
os_build: [Windows, WindowsStore, Linux, Macos, FreeBSD, SunOS, AIX]
2439+
arch_build: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, sparc, sparcv9, mips, mips64, avr, s390, s390x, sh4le, e2k-v2, e2k-v3, e2k-v4, e2k-v5, e2k-v6, e2k-v7]
2440+
2441+
# Only for building cross compilation tools, 'os_target/arch_target' is the system for
2442+
# which the tools generate code
2443+
os_target: [Windows, Linux, Macos, Android, iOS, watchOS, tvOS, FreeBSD, SunOS, AIX, Arduino, Neutrino]
2444+
arch_target: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, sparc, sparcv9, mips, mips64, avr, s390, s390x, asm.js, wasm, sh4le, e2k-v2, e2k-v3, e2k-v4, e2k-v5, e2k-v6, e2k-v7]
2445+
2446+
# Rest of the settings are "host" settings:
2447+
# - For native building/cross building: Where the library/program will run.
2448+
# - For building cross compilation tools: Where the cross compiler will run.
2449+
os:
2450+
Windows:
2451+
subsystem: [None, cygwin, msys, msys2, wsl]
2452+
WindowsStore:
2453+
version: ["8.1", "10.0"]
2454+
WindowsCE:
2455+
platform: ANY
2456+
version: ["5.0", "6.0", "7.0", "8.0"]
2457+
Linux:
2458+
Macos:
2459+
version: [None, "10.6", "10.7", "10.8", "10.9", "10.10", "10.11", "10.12", "10.13", "10.14", "10.15", "11.0", "13.0"]
2460+
sdk: [None, "macosx"]
2461+
subsystem: [None, catalyst]
2462+
Android:
2463+
api_level: ANY
2464+
iOS:
2465+
version: ["7.0", "7.1", "8.0", "8.1", "8.2", "8.3", "9.0", "9.1", "9.2", "9.3", "10.0", "10.1", "10.2", "10.3", "11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", "13.0", "13.1", "13.2", "13.3", "13.4", "13.5", "13.6"]
2466+
sdk: [None, "iphoneos", "iphonesimulator"]
2467+
watchOS:
2468+
version: ["4.0", "4.1", "4.2", "4.3", "5.0", "5.1", "5.2", "5.3", "6.0", "6.1"]
2469+
sdk: [None, "watchos", "watchsimulator"]
2470+
tvOS:
2471+
version: ["11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", "13.0"]
2472+
sdk: [None, "appletvos", "appletvsimulator"]
2473+
FreeBSD:
2474+
SunOS:
2475+
AIX:
2476+
Arduino:
2477+
board: ANY
2478+
Emscripten:
2479+
Neutrino:
2480+
version: ["6.4", "6.5", "6.6", "7.0", "7.1"]
2481+
arch: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv4, armv4i, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, sparc, sparcv9, mips, mips64, avr, s390, s390x, asm.js, wasm, sh4le, e2k-v2, e2k-v3, e2k-v4, e2k-v5, e2k-v6, e2k-v7]
2482+
compiler:
2483+
sun-cc:
2484+
version: ["5.10", "5.11", "5.12", "5.13", "5.14", "5.15"]
2485+
threads: [None, posix]
2486+
libcxx: [libCstd, libstdcxx, libstlport, libstdc++]
2487+
gcc: &gcc
2488+
version: ["4.1", "4.4", "4.5", "4.6", "4.7", "4.8", "4.9",
2489+
"5", "5.1", "5.2", "5.3", "5.4", "5.5",
2490+
"6", "6.1", "6.2", "6.3", "6.4", "6.5",
2491+
"7", "7.1", "7.2", "7.3", "7.4", "7.5",
2492+
"8", "8.1", "8.2", "8.3", "8.4",
2493+
"9", "9.1", "9.2", "9.3",
2494+
"10", "10.1", "10.2", "10.3",
2495+
"11", "11.1"]
2496+
libcxx: [libstdc++, libstdc++11]
2497+
threads: [None, posix, win32] # Windows MinGW
2498+
exception: [None, dwarf2, sjlj, seh] # Windows MinGW
2499+
cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23]
2500+
Visual Studio: &visual_studio
2501+
runtime: [MD, MT, MTd, MDd]
2502+
version: ["8", "9", "10", "11", "12", "14", "15", "16", "17"]
2503+
toolset: [None, v90, v100, v110, v110_xp, v120, v120_xp,
2504+
v140, v140_xp, v140_clang_c2, LLVM-vs2012, LLVM-vs2012_xp,
2505+
LLVM-vs2013, LLVM-vs2013_xp, LLVM-vs2014, LLVM-vs2014_xp,
2506+
LLVM-vs2017, LLVM-vs2017_xp, v141, v141_xp, v141_clang_c2, v142,
2507+
llvm, ClangCL, v143]
2508+
cppstd: [None, 14, 17, 20]
2509+
msvc:
2510+
version: ["19.0",
2511+
"19.1", "19.10", "19.11", "19.12", "19.13", "19.14", "19.15", "19.16",
2512+
"19.2", "19.20", "19.21", "19.22", "19.23", "19.24", "19.25", "19.26", "19.27", "19.28", "19.29",
2513+
"19.3", "19.30"]
2514+
runtime: [static, dynamic]
2515+
runtime_type: [Debug, Release]
2516+
cppstd: [14, 17, 20, 23]
2517+
clang:
2518+
version: ["3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "4.0",
2519+
"5.0", "6.0", "7.0", "7.1",
2520+
"8", "9", "10", "11", "12", "13"]
2521+
libcxx: [None, libstdc++, libstdc++11, libc++, c++_shared, c++_static]
2522+
cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23]
2523+
runtime: [None, MD, MT, MTd, MDd]
2524+
apple-clang: &apple_clang
2525+
version: ["5.0", "5.1", "6.0", "6.1", "7.0", "7.3", "8.0", "8.1", "9.0", "9.1", "10.0", "11.0", "12.0", "13.0"]
2526+
libcxx: [libstdc++, libc++]
2527+
cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20]
2528+
intel:
2529+
version: ["11", "12", "13", "14", "15", "16", "17", "18", "19", "19.1"]
2530+
base:
2531+
gcc:
2532+
<<: *gcc
2533+
threads: [None]
2534+
exception: [None]
2535+
Visual Studio:
2536+
<<: *visual_studio
2537+
apple-clang:
2538+
<<: *apple_clang
2539+
qcc:
2540+
version: ["4.4", "5.4", "8.3"]
2541+
libcxx: [cxx, gpp, cpp, cpp-ne, accp, acpp-ne, ecpp, ecpp-ne]
2542+
cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17]
2543+
mcst-lcc:
2544+
version: ["1.19", "1.20", "1.21", "1.22", "1.23", "1.24", "1.25"]
2545+
base:
2546+
gcc:
2547+
<<: *gcc
2548+
threads: [None]
2549+
exceptions: [None]
2550+
2551+
build_type: [None, Debug, Release, RelWithDebInfo, MinSizeRel]
2552+
2553+
2554+
cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23] # Deprecated, use compiler.cppstd
2555+
"""

0 commit comments

Comments
 (0)
Please sign in to comment.