diff options
author | Wolfgang Stöggl <c72578@yahoo.de> | 2019-11-02 09:33:42 +0100 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-11-02 23:37:15 +0200 |
commit | bd277690301955c23f8457f726cdc18325ac1b43 (patch) | |
tree | ba6ecc93adde9a92f7ce7348586ac217bd9893b8 | |
parent | f5c88932810ded5ea3d4a2f4a8f0350635c3c44a (diff) | |
download | meson-bd277690301955c23f8457f726cdc18325ac1b43.zip meson-bd277690301955c23f8457f726cdc18325ac1b43.tar.gz meson-bd277690301955c23f8457f726cdc18325ac1b43.tar.bz2 |
Fix split of CMAKE_PREFIX_PATH under Windows
Under Windows, the colon ':' is used after the drive letter.
So, the colon should not be used as a list separator or for splitting,
otherwise it could lead to paths in CMAKE_PREFIX_PATH with a
semicolon ';' between the drive letter and the rest of the path, e.g:
-DCMAKE_PREFIX_PATH=C;/foo/bar
instead of
-DCMAKE_PREFIX_PATH=C:/foo/bar
Use os.pathsep instead of ':' to split the environmental variable
CMAKE_PREFIX_PATH
-rw-r--r-- | mesonbuild/dependencies/base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 3c55a56..3bdc413 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -1114,8 +1114,8 @@ class CMakeDependency(ExternalDependency): pref_path = self.env.coredata.builtins_per_machine[self.for_machine]['cmake_prefix_path'].value if 'CMAKE_PREFIX_PATH' in os.environ: - env_pref_path = os.environ['CMAKE_PREFIX_PATH'].split(':') - env_pref_path = [x for x in env_pref_path if x] # Filter out enpty strings + env_pref_path = os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep) + env_pref_path = [x for x in env_pref_path if x] # Filter out empty strings if not pref_path: pref_path = [] pref_path += env_pref_path |