ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2025-01-19 02:48:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Meson Scripts Paths (#1193)

Browse Source
This commit is contained in:
Florian Märkl 2019-02-13 20:38:02 +01:00 committed by xarkes
parent 2132b5cb09
commit 355e726e4a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/meson.build
View File

@ -17,7 +17,7 @@ if get_option('enable_jupyter')
endif endif
endif endif
parse_cmd = [py3_exe, '../scripts/meson_parse_qmake.py'] parse_cmd = [py3_exe, join_paths(meson.current_source_dir(), '../scripts/meson_parse_qmake.py')]
qt_modules += run_command(parse_cmd + ['QT'], check: true).stdout().split(';') qt_modules += run_command(parse_cmd + ['QT'], check: true).stdout().split(';')
sources = run_command(parse_cmd + ['SOURCES'], check: true).stdout().split(';') sources = run_command(parse_cmd + ['SOURCES'], check: true).stdout().split(';')
@ -34,7 +34,7 @@ conf_json = '''{"CUTTER_VERSION_MAJOR":@0@,
version_major, version_minor, version_patch) version_major, version_minor, version_patch)
configure_file(input: 'CutterConfig.h.in', configure_file(input: 'CutterConfig.h.in',
output: 'CutterConfig.h', output: 'CutterConfig.h',
command: [py3_exe, '../scripts/meson_configure_qmake_in.py', '@INPUT@', '@OUTPUT0@', conf_json]) command: [py3_exe, join_paths(meson.current_source_dir(), '../scripts/meson_configure_qmake_in.py'), '@INPUT@', '@OUTPUT0@', conf_json])
conf_inc = include_directories('.') conf_inc = include_directories('.')
sp_dir = join_paths(meson.source_root(), 'subprojects') sp_dir = join_paths(meson.source_root(), 'subprojects')