From b4d55bbf853adfb5a81a39aad4672de92c5737be Mon Sep 17 00:00:00 2001 From: Anton Date: Wed, 25 Jan 2023 08:39:26 +0000 Subject: [PATCH] Apply suggestions from code review Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com> --- recipes/libev/all/conanfile.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/libev/all/conanfile.py b/recipes/libev/all/conanfile.py index 5e3a8c40cbe70..7e2f35fce7815 100644 --- a/recipes/libev/all/conanfile.py +++ b/recipes/libev/all/conanfile.py @@ -36,7 +36,7 @@ def _settings_build(self): def export_sources(self): copy(self, "CMakeLists.txt", self.recipe_folder, dst=self.export_sources_folder) - copy(self, "config.h", self.recipe_folder, os.path.join(self.export_sources_folder, "src")) + copy(self, "config.h", self.recipe_folder, self.export_sources_folder) def config_options(self): if self.settings.os == "Windows": @@ -65,8 +65,6 @@ def build_requirements(self): def source(self): get(self, **self.conan_data["sources"][self.version], destination=self.source_folder, strip_root=True) - if not is_msvc(self): - rm(self, "config.h", os.path.join(self.export_sources_folder, "src")) def generate(self): if is_msvc(self): @@ -81,8 +79,10 @@ def generate(self): def build(self): if is_msvc(self): + base_folder = os.path.join(self.source_folder, os.pardir) + copy(self, "config.h", src=base_folder, dst=self.source_folder) cmake = CMake(self) - cmake.configure(build_script_folder=os.path.join(self.source_folder, os.pardir)) + cmake.configure(build_script_folder=base_folder) cmake.build() else: autotools = Autotools(self)