Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cmake: fixed installed_files.txt

This commit is contained in:
Daniel Mensinger 2019-04-19 10:14:50 +02:00
parent 7c4f46b65c
commit cb57847c30
No known key found for this signature in database
GPG Key ID: 54DD94C131E277D4
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
run_project_tests.py
View File

@ -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)

6
test cases/cmake/2 advanced/installed_files.txt
View File

@ -1,2 +1,4 @@
usr/lib/libcmModLib.so
usr/bin/testEXE
usr/?lib/libcmModLib?so
?cygwin:usr/lib/libcmModLib?implib
?!cygwin:usr/bin/libcmModLib?implib
usr/bin/testEXE?exe

6
test cases/cmake/3 advanced no dep/installed_files.txt Normal file
View File

@ -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