Skip to content

Commit 9600f18

Browse files
committed
Add arm64 C++20 profile and update dependencies
Introduced a new arm64_cpp20_profile for Windows builds with C++20 and updated several dependency configurations. Added 'shapely/2.0.6' to requirements, removed 'pynavlib' from requirements and pip lists, and updated cpython to version 3.12.7 in conanfile.py.
1 parent 55b813b commit 9600f18

File tree

3 files changed

+35
-63
lines changed

3 files changed

+35
-63
lines changed

arm64_cpp20_profile

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
[settings]
2+
arch=armv8
3+
build_type=Release
4+
compiler=msvc
5+
compiler.cppstd=20
6+
compiler.runtime=dynamic
7+
compiler.runtime_type=Release
8+
compiler.version=194
9+
os=Windows
10+
[options]
11+
asio-grpc/*:local_allocator=recycling_allocator
12+
boost/*:header_only=True
13+
clipper/*:shared=True
14+
cpython/*:shared=True
15+
cpython/*:with_curses=False
16+
cpython/*:with_tkinter=False
17+
dulcificum/*:shared=False
18+
grpc/*:csharp_plugin=False
19+
grpc/*:node_plugin=False
20+
grpc/*:objective_c_plugin=False
21+
grpc/*:php_plugin=False
22+
grpc/*:python_plugin=False
23+
grpc/*:ruby_plugin=False
24+
mpdecimal/*:shared=True
25+
onetbb/*:tbbproxy=False
26+
pyarcus/*:shared=True
27+
pynest2d/*:shared=True
28+
pysavitar/*:shared=True
29+
[conf]
30+
tools.build:skip_test=True
31+
tools.cmake.cmaketoolchain:generator=Ninja
32+
tools.gnu:define_libcxx11_abi=True
33+
tools.system.package_manager:sudo=True

conandata.yml

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ requirements:
99
- "dulcificum/5.10.0"
1010
- "pysavitar/5.11.0-alpha.0"
1111
- "pynest2d/5.10.0"
12+
- "shapely/2.0.6"
1213
requirements_internal:
1314
- "fdm_materials/5.12.0-alpha.0@ultimaker/testing"
1415
- "cura_private_data/5.12.0-alpha.0@internal/testing"
@@ -127,7 +128,6 @@ pyinstaller:
127128
- "PyQt6.sip"
128129
- "stl"
129130
- "keyrings.alt"
130-
- "pynavlib"
131131
collect_all_WINDOWS_ONLY:
132132
- "PyQt6.Qt"
133133
- "PyQt6.Qt6"
@@ -410,51 +410,6 @@ pip_requirements_core:
410410
hashes:
411411
- sha256:b6feb6455337df834f6c9962d6ccf771515b7d939bca142b29c20c2376bc6111
412412
- sha256:7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
413-
shapely:
414-
version: "2.0.6"
415-
hashes:
416-
- sha256:29a34e068da2d321e926b5073539fd2a1d4429a2c656bd63f0bd4c8f5b236d0b
417-
- sha256:e1c84c3f53144febf6af909d6b581bc05e8785d57e27f35ebaa5c1ab9baba13b
418-
- sha256:2ad2fae12dca8d2b727fa12b007e46fbc522148a584f5d6546c539f3464dccde
419-
- sha256:b3304883bd82d44be1b27a9d17f1167fda8c7f5a02a897958d86c59ec69b705e
420-
- sha256:3ec3a0eab496b5e04633a39fa3d5eb5454628228201fb24903d38174ee34565e
421-
- sha256:28f87cdf5308a514763a5c38de295544cb27429cfa655d50ed8431a4796090c4
422-
- sha256:5aeb0f51a9db176da9a30cb2f4329b6fbd1e26d359012bb0ac3d3c7781667a9e
423-
- sha256:9a7a78b0d51257a367ee115f4d41ca4d46edbd0dd280f697a8092dd3989867b2
424-
- sha256:f32c23d2f43d54029f986479f7c1f6e09c6b3a19353a3833c2ffb226fb63a855
425-
- sha256:b3dc9fb0eb56498912025f5eb352b5126f04801ed0e8bdbd867d21bdbfd7cbd0
426-
- sha256:d93b7e0e71c9f095e09454bf18dad5ea716fb6ced5df3cb044564a00723f339d
427-
- sha256:c02eb6bf4cfb9fe6568502e85bb2647921ee49171bcd2d4116c7b3109724ef9b
428-
- sha256:cec9193519940e9d1b86a3b4f5af9eb6910197d24af02f247afbfb47bcb3fab0
429-
- sha256:83b94a44ab04a90e88be69e7ddcc6f332da7c0a0ebb1156e1c4f568bbec983c3
430-
- sha256:537c4b2716d22c92036d00b34aac9d3775e3691f80c7aa517c2c290351f42cd8
431-
- sha256:98fea108334be345c283ce74bf064fa00cfdd718048a8af7343c59eb40f59726
432-
- sha256:42fd4cd4834747e4990227e4cbafb02242c0cffe9ce7ef9971f53ac52d80d55f
433-
- sha256:665990c84aece05efb68a21b3523a6b2057e84a1afbef426ad287f0796ef8a48
434-
- sha256:42805ef90783ce689a4dde2b6b2f261e2c52609226a0438d882e3ced40bb3013
435-
- sha256:6d2cb146191a47bd0cee8ff5f90b47547b82b6345c0d02dd8b25b88b68af62d7
436-
- sha256:e3fdef0a1794a8fe70dc1f514440aa34426cc0ae98d9a1027fb299d45741c381
437-
- sha256:2c665a0301c645615a107ff7f52adafa2153beab51daf34587170d85e8ba6805
438-
- sha256:0334bd51828f68cd54b87d80b3e7cee93f249d82ae55a0faf3ea21c9be7b323a
439-
- sha256:d37d070da9e0e0f0a530a621e17c0b8c3c9d04105655132a87cfff8bd77cc4c2
440-
- sha256:fa7468e4f5b92049c0f36d63c3e309f85f2775752e076378e36c6387245c5462
441-
- sha256:ed5867e598a9e8ac3291da6cc9baa62ca25706eea186117034e8ec0ea4355653
442-
- sha256:81d9dfe155f371f78c8d895a7b7f323bb241fb148d848a2bf2244f79213123fe
443-
- sha256:fbb7bf02a7542dba55129062570211cfb0defa05386409b3e306c39612e7fbcc
444-
- sha256:837d395fac58aa01aa544495b97940995211e3e25f9aaf87bc3ba5b3a8cd1ac7
445-
- sha256:c6d88ade96bf02f6bfd667ddd3626913098e243e419a0325ebef2bbd481d1eb6
446-
- sha256:8b3b818c4407eaa0b4cb376fd2305e20ff6df757bf1356651589eadc14aab41b
447-
- sha256:1bbc783529a21f2bd50c79cef90761f72d41c45622b3e57acf78d984c50a5d13
448-
- sha256:2423f6c0903ebe5df6d32e0066b3d94029aab18425ad4b07bf98c3972a6e25a1
449-
- sha256:2de00c3bfa80d6750832bde1d9487e302a6dd21d90cb2f210515cefdb616e5f5
450-
- sha256:3a82d58a1134d5e975f19268710e53bddd9c473743356c90d97ce04b73e101ee
451-
- sha256:392f66f458a0a2c706254f473290418236e52aa4c9b476a072539d63a2460595
452-
- sha256:eba5bae271d523c938274c61658ebc34de6c4b33fdf43ef7e938b5776388c1be
453-
- sha256:7060566bc4888b0c8ed14b5d57df8a0ead5c28f9b69fb6bed4476df31c51b0af
454-
- sha256:b02154b3e9d076a29a8513dffcb80f047a5ea63c897c0cd3d3679f29363cf7e5
455-
- sha256:44246d30124a4f1a638a7d5419149959532b99dfa25b54393512e6acc9c211ac
456-
- sha256:2b542d7f1dbb89192d3512c52b679c822ba916f93479fa5d4fc2fe4fa0b3c9e8
457-
- sha256:997f6159b1484059ec239cacaa53467fd8b5564dabe186cd84ac2944663b0bf6
458413
cython:
459414
version: "0.29.26"
460415
hashes:
@@ -596,22 +551,6 @@ pip_requirements_core:
596551
hashes:
597552
- sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8
598553
- sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755
599-
pynavlib:
600-
version: "0.9.4"
601-
hashes:
602-
- sha256:fdd5ab5b6e0a2c9bbcebb154ac7303daf845865a1649be04e1bd8e8e5889401f
603-
- sha256:493c4b3cacc939b021a694d99723106dbd7ee5515ad4dfc1c7fc8219ef20cf3a
604-
- sha256:332831553a70be05fe58c43a08109b42970cfedc6086ffb4306859142a0e9210
605-
- sha256:9173f61ad83172c306b92bbe38f949889c158cd6dfdc924db01f257a437bf2a6
606-
607-
Macos:
608-
pynavlib:
609-
version: "0.9.4"
610-
hashes:
611-
- sha256:567efd0af97f9014326898b209eea94d9f5cc58e9f589ccf8354584568fcb87d
612-
- sha256:f0d7ce426e816788aa96b419fd7da263eafb99aca46ce3b6e5dbaf2bbf6b614a
613-
- sha256:33962a322033a78db05a8c2cc3d59e057fbea5b04879c3c54e2fe3041d691a12
614-
- sha256:d06d94b1dee4ba024b4a121869e572f571673a3b8c15b4055f52236d43c19a02
615554

616555
pip_requirements_dev:
617556
any_os:

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ def requirements(self):
598598
if self.options.enterprise:
599599
for req in self.conan_data["requirements_enterprise"]:
600600
self.requires(req)
601-
self.requires("cpython/3.12.2")
601+
self.requires("cpython/3.12.7")
602602

603603
def layout(self):
604604
self.folders.source = "."

0 commit comments

Comments
 (0)