Skip to content

Commit

Permalink
Add missing Apple OS releases (#17012)
Browse files Browse the repository at this point in the history 
* Add missing Apple OS releases

* CMake support for newer Apple OS versions
  • Loading branch information
@AbrilRBS
AbrilRBS authored Sep 18, 2024
1 parent 2d44b90 commit 7179562
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 15 deletions.
25 changes: 15 additions & 10 deletions conan/internal/default_settings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,43 +19,48 @@
"13.0", "13.1", "13.2", "13.3", "13.4", "13.5", "13.6", "13.7",
"14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "14.6", "14.7", "14.8",
"15.0", "15.1", "15.2", "15.3", "15.4", "15.5", "15.6", "16.0", "16.1",
"16.2", "16.3", "16.4", "16.5", "16.6", "17.0", "17.1", "17.2", "17.3", "17.4", "17.5"]
"16.2", "16.3", "16.4", "16.5", "16.6", "17.0", "17.1", "17.2", "17.3", "17.4", "17.5",
"18.0", "18.1"]
sdk: ["iphoneos", "iphonesimulator"]
sdk_version: [null, "11.3", "11.4", "12.0", "12.1", "12.2", "12.4",
"13.0", "13.1", "13.2", "13.4", "13.5", "13.6", "13.7",
"14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "15.0", "15.2", "15.4",
"15.5", "16.0", "16.1", "16.2", "16.4", "17.0", "17.1", "17.2", "17.4", "17.5"]
"15.5", "16.0", "16.1", "16.2", "16.4", "17.0", "17.1", "17.2", "17.4", "17.5",
"18.0", "18.1"]
watchOS:
version: ["4.0", "4.1", "4.2", "4.3", "5.0", "5.1", "5.2", "5.3", "6.0", "6.1", "6.2",
"7.0", "7.1", "7.2", "7.3", "7.4", "7.5", "7.6", "8.0", "8.1", "8.3", "8.4",
"8.5", "8.6", "8.7", "9.0", "9.1", "9.2", "9.3", "9.4", "9.5", "9.6",
"10.0", "10.1", "10.2", "10.3", "10.4", "10.5"]
"10.0", "10.1", "10.2", "10.3", "10.4", "10.5", "11.0", "11.1"]
sdk: ["watchos", "watchsimulator"]
sdk_version: [null, "4.3", "5.0", "5.1", "5.2", "5.3", "6.0", "6.1", "6.2",
"7.0", "7.1", "7.2", "7.4", "8.0", "8.0.1", "8.3", "8.5", "9.0", "9.1",
"9.4", "10.0", "10.1", "10.2", "10.4", "10.5"]
"9.4", "10.0", "10.1", "10.2", "10.4", "10.5", "11.0", "11.1"]
tvOS:
version: ["11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4",
"13.0", "13.2", "13.3", "13.4", "14.0", "14.2", "14.3", "14.4", "14.5",
"14.6", "14.7", "15.0", "15.1", "15.2", "15.3", "15.4", "15.5", "15.6",
"16.0", "16.1", "16.2", "16.3", "16.4", "16.5", "16.6", "17.0", "17.1", "17.2", "17.3", "17.4",
"17.5"]
"17.5", "18.0", "18.1"]
sdk: ["appletvos", "appletvsimulator"]
sdk_version: [null, "11.3", "11.4", "12.0", "12.1", "12.2", "12.4",
"13.0", "13.1", "13.2", "13.4", "14.0", "14.2", "14.3", "14.5", "15.0",
"15.2", "15.4", "16.0", "16.1", "16.4", "17.0", "17.1", "17.2", "17.4", "17.5"]
"15.2", "15.4", "16.0", "16.1", "16.4", "17.0", "17.1", "17.2", "17.4", "17.5",
"18.0", "18.1"]
visionOS:
version: ["1.0", "1.1", "1.2"]
version: ["1.0", "1.1", "1.2", "2.0", "2.1"]
sdk: ["xros", "xrsimulator"]
sdk_version: [null, "1.0", "1.1", "1.2"]
sdk_version: [null, "1.0", "1.1", "1.2", "2.0", "2.1"]
Macos:
version: [null, "10.6", "10.7", "10.8", "10.9", "10.10", "10.11", "10.12", "10.13", "10.14", "10.15",
"11.0", "11.1", "11.2", "11.3", "11.4", "11.5", "11.6", "11.7",
"12.0", "12.1", "12.2", "12.3", "12.4", "12.5", "12.6", "12.7",
"13.0", "13.1", "13.2", "13.3", "13.4", "13.5", "13.6",
"14.0", "14.1", "14.2", "14.3", "14.4", "14.5"]
"14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "14.6",
"15.0", "15.1"]
sdk_version: [null, "10.13", "10.14", "10.15", "11.0", "11.1", "11.3", "12.0", "12.1",
"12.3", "13.0", "13.1", "13.3", "14.0", "14.2", "14.4", "14.5"]
"12.3", "13.0", "13.1", "13.3", "14.0", "14.2", "14.4", "14.5",
"15.0", "15.1"]
subsystem:
null:
catalyst:
Expand Down
11 changes: 6 additions & 5 deletions conan/tools/cmake/toolchain/blocks.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1014,26 +1014,27 @@ def _is_apple_cross_building(self):
@staticmethod
def _get_darwin_version(os_name, os_version):
# version mapping from https://en.wikipedia.org/wiki/Darwin_(operating_system)
# but a more detailed version can be found in https://theapplewiki.com/wiki/Kernel
version_mapping = {
"Macos": {
"10.6": "10", "10.7": "11", "10.8": "12", "10.9": "13", "10.10": "14", "10.11": "15",
"10.12": "16", "10.13": "17", "10.14": "18", "10.15": "19", "11": "20", "12": "21",
"13": "22", "14": "23",
"13": "22", "14": "23", "15": "24"
},
"iOS": {
"7": "14", "8": "14", "9": "15", "10": "16", "11": "17", "12": "18", "13": "19",
"14": "20", "15": "21", "16": "22", "17": "23"
"14": "20", "15": "21", "16": "22", "17": "23", "18": "24"
},
"watchOS": {
"4": "17", "5": "18", "6": "19", "7": "20",
"8": "21", "9": "22", "10": "23"
"8": "21", "9": "22", "10": "23", "11": "24"
},
"tvOS": {
"11": "17", "12": "18", "13": "19", "14": "20",
"15": "21", "16": "22", "17": "23"
"15": "21", "16": "22", "17": "23", "18": "24"
},
"visionOS": {
"1": "23"
"1": "23", "2": "24"
}
}
os_version = Version(os_version).major if os_name != "Macos" or (os_name == "Macos" and Version(
Expand Down

0 comments on commit 7179562

Please sign in to comment.