Skip to content

Commit

Permalink
keep previous self.copy for now
Browse files Browse the repository at this point in the history
Signed-off-by: Uilian Ries <uilianries@gmail.com>
  • Loading branch information
uilianries committed Aug 3, 2022
1 parent 8e13eed commit 5cef0dc
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions recipes/boost/all/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
from conan.tools.build import cross_building
from conan.tools.files import rename, rmdir, get, copy
from conan.tools.files import rename, rmdir, get
from conan.tools.files.patches import apply_conandata_patches
from conan.tools.microsoft import msvc_runtime_flag
from conan.tools.scm import Version
from conans import ConanFile, tools
from conans.errors import ConanException, ConanInvalidConfiguration
from conans import tools
from conan import ConanFile
from conan.errors import ConanException, ConanInvalidConfiguration

import glob
import os
Expand Down Expand Up @@ -151,10 +152,10 @@ class BoostConan(ConanFile):

def export_sources(self):
for patch in self.conan_data.get("patches", {}).get(self.version, []):
copy(self, patch["patch_file"])
self.copy(patch["patch_file"])

def export(self):
copy(self, self._dependency_filename, src="dependencies", dst="dependencies")
self.copy(self._dependency_filename, src="dependencies", dst="dependencies")

@property
def _min_compiler_version_default_cxx11(self):
Expand Down Expand Up @@ -1355,11 +1356,11 @@ def _toolset_tag(self):
def package(self):
# This stage/lib is in source_folder... Face palm, looks like it builds in build but then
# copy to source with the good lib name
copy(self, "LICENSE_1_0.txt", dst="licenses", src=os.path.join(self.source_folder,
self.copy("LICENSE_1_0.txt", dst="licenses", src=os.path.join(self.source_folder,
self._source_subfolder))
rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
if self.options.header_only:
copy(self, pattern="*", dst="include/boost", src="%s/boost" % self._boost_dir)
self.copy(pattern="*", dst="include/boost", src="%s/boost" % self._boost_dir)

if self.settings.os == "Emscripten":
self._create_emscripten_libs()
Expand Down

0 comments on commit 5cef0dc

Please sign in to comment.