Skip to content

Commit

Permalink
Make paths format in layout consistent on Windows (conan-io#15260)
Browse files Browse the repository at this point in the history
Changelog: Omit
Docs: Omit
  • Loading branch information
juansblanco authored Dec 14, 2023
1 parent 9f023c3 commit 5becb2a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions conans/model/layout.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def source_folder(self):
if self._base_source is None:
return None
if not self.source:
return self._base_source
return os.path.normpath(self._base_source)

return os.path.normpath(os.path.join(self._base_source, self.source))

Expand All @@ -106,7 +106,7 @@ def build_folder(self):
if self._base_build is None:
return None
if not self.build:
return self._base_build
return os.path.normpath(self._base_build)
return os.path.normpath(os.path.join(self._base_build, self.build))

@property
Expand Down Expand Up @@ -147,7 +147,7 @@ def generators_folder(self):
if self._base_generators is None:
return None
if not self.generators:
return self._base_generators
return os.path.normpath(self._base_generators)
return os.path.normpath(os.path.join(self._base_generators, self.generators))

def set_base_generators(self, folder):
Expand Down

0 comments on commit 5becb2a

Please sign in to comment.