diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-04-19 10:14:50 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-06-06 18:27:03 +0200 |
| commit | cb57847c30ce49d03e2b98f8466b11acf3cf21fd (patch) | |
| tree | a912745eb93a62eb80d3048d12dc341a677bc3c7 | |
| parent | 7c4f46b65c6d9d8bf71c0eca3c75e5f8b5f73617 (diff) | |
| download | meson-cb57847c30ce49d03e2b98f8466b11acf3cf21fd.zip meson-cb57847c30ce49d03e2b98f8466b11acf3cf21fd.tar.gz meson-cb57847c30ce49d03e2b98f8466b11acf3cf21fd.tar.bz2 | |
cmake: fixed installed_files.txt
| -rwxr-xr-x | run_project_tests.py | 5 | ||||
| -rw-r--r-- | test cases/cmake/2 advanced/installed_files.txt | 6 | ||||
| -rw-r--r-- | test cases/cmake/3 advanced no dep/installed_files.txt | 6 |
3 files changed, 15 insertions, 2 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index c3187ff..f4b4a96 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -161,6 +161,11 @@ def platform_fix_name(fname, compiler, env): if not mesonlib.for_cygwin(env.is_cross_build(), env): return None + if fname.startswith('?!cygwin:'): + fname = fname[9:] + if mesonlib.for_cygwin(env.is_cross_build(), env): + return None + if fname.endswith('?so'): if mesonlib.for_windows(env.is_cross_build(), env) and canonical_compiler == 'msvc': fname = re.sub(r'lib/([^/]*)\?so$', r'bin/\1.dll', fname) diff --git a/test cases/cmake/2 advanced/installed_files.txt b/test cases/cmake/2 advanced/installed_files.txt index 40235a5..8cbdcd7 100644 --- a/test cases/cmake/2 advanced/installed_files.txt +++ b/test cases/cmake/2 advanced/installed_files.txt @@ -1,2 +1,4 @@ -usr/lib/libcmModLib.so -usr/bin/testEXE
\ No newline at end of file +usr/?lib/libcmModLib?so +?cygwin:usr/lib/libcmModLib?implib +?!cygwin:usr/bin/libcmModLib?implib +usr/bin/testEXE?exe
\ No newline at end of file diff --git a/test cases/cmake/3 advanced no dep/installed_files.txt b/test cases/cmake/3 advanced no dep/installed_files.txt new file mode 100644 index 0000000..e16e27d --- /dev/null +++ b/test cases/cmake/3 advanced no dep/installed_files.txt @@ -0,0 +1,6 @@ +usr/?lib/libcmModLib?so +?cygwin:usr/lib/libcmModLib?implib +?!cygwin:usr/bin/libcmModLib?implib +?msvc:usr/bin/cmModLib.pdb +?msvc:usr/bin/testEXE.pdb +usr/bin/testEXE?exe
\ No newline at end of file |