Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com>
  • Loading branch information
Anton and SpaceIm authored Jan 25, 2023
1 parent 53a3be4 commit b4d55bb
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions recipes/libev/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down Expand Up @@ -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):
Expand All @@ -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)
Expand Down

0 comments on commit b4d55bb

Please sign in to comment.