summaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-12-03 22:48:56 +0200
committerGitHub <noreply@github.com>2017-12-03 22:48:56 +0200
commitcf76ffad145eb83a0bbfce89e05b7610637ff293 (patch)
tree9d76dd2d2f2398fbca00bdfad434297246338213 /test cases
parent2cf1e8da15b954725fa9c9467bfb35a516814c89 (diff)
parentbccb7a8eb8f13fc747f5198ee0d77ecaf1b77be7 (diff)
downloadmeson-cf76ffad145eb83a0bbfce89e05b7610637ff293.tar.gz
Merge pull request #2703 from mesonbuild/msvc-library-search-fixes
Various MSVC library search fixes
Diffstat (limited to 'test cases')
-rw-r--r--test cases/unit/17 pkgconfig static/meson.build16
1 files changed, 15 insertions, 1 deletions
diff --git a/test cases/unit/17 pkgconfig static/meson.build b/test cases/unit/17 pkgconfig static/meson.build
index caeb4aae2..d1b0fd5ac 100644
--- a/test cases/unit/17 pkgconfig static/meson.build
+++ b/test cases/unit/17 pkgconfig static/meson.build
@@ -5,8 +5,22 @@ if build_machine.system() != 'windows'
else
# pkg-config files should not use paths with \
prefix_parts = meson.source_root().split('\\')
- prefix = '/'.join(prefix_parts)
+ # If the path is C:/foo/bar, convert it to /c/foo/bar so we can test if our
+ # automatic conversion to C:/foo/bar inside PkgConfigDependency is working.
+ if prefix_parts[0][1] == ':'
+ drive = prefix_parts[0][0]
+ else
+ drive = prefix_parts[0]
+ endif
+ new_parts = []
+ foreach part : prefix_parts
+ if part != prefix_parts[0]
+ new_parts += part
+ endif
+ endforeach
+ prefix = '/@0@/@1@'.format(drive, '/'.join(new_parts))
endif
+message(prefix)
# Escape spaces
prefix_parts = prefix.split(' ')