Skip to content

Commit

Permalink
tools.remove_files_by_mask was recursive by default, but rm is not
Browse files Browse the repository at this point in the history
Co-authored-by: ericLemanissier <ericLemanissier@users.noreply.github.com>
  • Loading branch information
kambala-decapitator and ericLemanissier authored Aug 30, 2022
1 parent e579c5f commit 33a3577
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions recipes/qt/5.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -801,10 +801,10 @@ def package(self):
rmdir(self, os.path.join(self.package_folder, "licenses", module))
rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
for mask in ["Find*.cmake", "*Config.cmake", "*-config.cmake"]:
rm(self, mask, self.package_folder)
rm(self, "*.la*", os.path.join(self.package_folder, "lib"))
rm(self, "*.pdb*", os.path.join(self.package_folder, "lib"))
rm(self, "*.pdb", os.path.join(self.package_folder, "bin"))
rm(self, mask, self.package_folder, recursive=True)
rm(self, "*.la*", os.path.join(self.package_folder, "lib"), recursive=True)
rm(self, "*.pdb*", os.path.join(self.package_folder, "lib"), recursive=True)
rm(self, "*.pdb", os.path.join(self.package_folder, "bin"), recursive=True)
# "Qt5Bootstrap" is internal Qt library - removing it to avoid linking error, since it contains
# symbols that are also in "Qt5Core.lib". It looks like there is no "Qt5Bootstrap.dll".
for fl in glob.glob(os.path.join(self.package_folder, "lib", "*Qt5Bootstrap*")):
Expand Down

0 comments on commit 33a3577

Please sign in to comment.