Skip to content

Commit

Permalink
Merge pull request #247 from Ultimaker/fix_materials_not_in_cura
Browse files Browse the repository at this point in the history
Use new package structure
  • Loading branch information
jellespijker committed Mar 31, 2023
2 parents 2d0febc + 64e773f commit 9fdbc62
Showing 1 changed file with 13 additions and 17 deletions.
30 changes: 13 additions & 17 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from conans import tools
from conan.errors import ConanInvalidConfiguration

required_conan_version = ">=1.47.0"
required_conan_version = ">=1.56.0"


class FDM_MaterialsConan(ConanFile):
Expand All @@ -18,26 +18,22 @@ class FDM_MaterialsConan(ConanFile):
exports = "LICENSE*"
settings = "os", "compiler", "build_type", "arch"
no_copy_source = True
scm = {
"type": "git",
"subfolder": ".",
"url": "auto",
"revision": "auto"
}

def export_sources(self):
copy(self, "*.fdm_material", self.recipe_folder, self.export_sources_folder)
copy(self, "*.sig", self.recipe_folder, self.export_sources_folder)

def validate(self):
if tools.Version(self.version) <= tools.Version("4"):
if Version(self.version) <= Version("4"):
raise ConanInvalidConfiguration("Only versions 5+ are support")

def layout(self):
self.cpp.package.resdirs = ["materials"]

def package(self):
self.copy("*.fdm_material", src = ".", dst = self.cpp.package.resdirs[0])
self.copy("*.sig", src = ".", dst = self.cpp.package.resdirs[0])
copy(self, "*.fdm_material", self.source_folder, os.path.join(self.package_folder, "res", "resources", "materials"), keep_path = False)
copy(self, "*.sig", self.source_folder, os.path.join(self.package_folder, "res", "resources", "materials"), keep_path = False)

def package_info(self):
self.cpp_info.includedirs = []
self.cpp_info.resdirs = ["res"]

def package_id(self):
del self.info.settings.os
del self.info.settings.compiler
del self.info.settings.build_type
del self.info.settings.arch
self.info.clear()

0 comments on commit 9fdbc62

Please sign in to comment.