diff options
author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-09-29 12:29:15 +0200 |
---|---|---|
committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-10-04 10:45:48 +0200 |
commit | 77b5c82d0725eb914aa341a617dd9f418de60910 (patch) | |
tree | cfdb171f0193e5b74ec3aade2ceb6e6af5865e7f /mesonbuild/dependencies/base.py | |
parent | 10b44584ff0b1f49ece260a48f89eb59c123616f (diff) | |
download | meson-77b5c82d0725eb914aa341a617dd9f418de60910.zip meson-77b5c82d0725eb914aa341a617dd9f418de60910.tar.gz meson-77b5c82d0725eb914aa341a617dd9f418de60910.tar.bz2 |
cmake: switch to pathlib (fixes #7322)
Diffstat (limited to 'mesonbuild/dependencies/base.py')
-rw-r--r-- | mesonbuild/dependencies/base.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 7b2f2d9..e622859 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -1528,12 +1528,12 @@ class CMakeDependency(ExternalDependency): self.compile_args = compileOptions + compileDefinitions + ['-I{}'.format(x) for x in incDirs] self.link_args = libraries - def _get_build_dir(self) -> str: + def _get_build_dir(self) -> Path: build_dir = Path(self.cmake_root_dir) / 'cmake_{}'.format(self.name) build_dir.mkdir(parents=True, exist_ok=True) - return str(build_dir) + return build_dir - def _setup_cmake_dir(self, cmake_file: str) -> str: + def _setup_cmake_dir(self, cmake_file: str) -> Path: # Setup the CMake build environment and return the "build" directory build_dir = self._get_build_dir() @@ -1557,7 +1557,7 @@ cmake_minimum_required(VERSION ${{CMAKE_VERSION}}) project(MesonTemp LANGUAGES {}) """.format(' '.join(cmake_language)) + cmake_txt - cm_file = Path(build_dir) / 'CMakeLists.txt' + cm_file = build_dir / 'CMakeLists.txt' cm_file.write_text(cmake_txt) mlog.cmd_ci_include(cm_file.absolute().as_posix()) |