3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2026-01-05 14:17:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use private data from internal conan-user

Browse source
This commit is contained in:
Erwan MATHIEU 2024-12-13 20:43:19 +01:00
parent 86e799e565
commit ddb5aee056
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
conandata.yml
View file

@ -9,8 +9,8 @@ requirements:
- "pysavitar/5.4.0-alpha.0@ultimaker/stable"
- "pynest2d/5.4.0-alpha.0@ultimaker/stable"
requirements_internal:
- "fdm_materials_private/5.10.0-alpha.0@ultimaker/testing"
- "cura_private_data/5.10.0-alpha.0@ultimaker/testing"
- "fdm_materials/5.10.0-alpha.0@internal/testing"
- "cura_private_data/5.10.0-alpha.0@internal/testing"
requirements_enterprise:
- "native_cad_plugin/2.0.0"
urls:

2
conanfile.py
View file

@ -412,7 +412,7 @@ class CuraConan(ConanFile):
# Copy materials (flat)
rmdir(self, str(Path(self.source_folder, "resources", "materials")))
fdm_materials = self.dependencies["fdm_materials_private" if self.options.internal else "fdm_materials"].cpp_info
fdm_materials = self.dependencies["fdm_materials"].cpp_info
copy(self, "*", fdm_materials.resdirs[0], self.source_folder)
# Copy internal resources