Skip to content

Commit

Permalink
Sync with main
Browse files Browse the repository at this point in the history
Contribute to NP-NP-637
  • Loading branch information
jellespijker committed Dec 12, 2024
1 parent 64591b3 commit 08128b0
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from conan.tools.scm import Version
from conan.errors import ConanInvalidConfiguration

required_conan_version = ">=1.56.0"
required_conan_version = ">=2.7.0"


class FDM_MaterialsConan(ConanFile):
Expand All @@ -31,10 +31,6 @@ 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 Version(self.version) <= Version("4"):
raise ConanInvalidConfiguration("Only versions 5+ are support")

def package(self):
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)
Expand All @@ -43,7 +39,6 @@ def package_info(self):
self.cpp_info.includedirs = []
self.cpp_info.resdirs = ["res"]
self.runenv_info.append_path("CURA_RESOURCES", os.path.join(self.package_folder, "res", "resources"))
self.env_info.CURA_RESOURCES.append(os.path.join(self.package_folder, "res", "resources"))

def package_id(self):
self.info.clear()

0 comments on commit 08128b0

Please sign in to comment.