Skip to content

Commit b7cc53b

Browse files
committed
Add current dir to include directories when compiling resource
Fixes #15206
1 parent f09cd0f commit b7cc53b

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

mesonbuild/modules/windows.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ def compile_resources(self, state: 'ModuleState',
155155
build.IncludeDirs('', [], False, [os.path.join('@BUILD_ROOT@', self.interpreter.backend.get_target_dir(d))])
156156
])
157157
include_directories = self.interpreter.extract_incdirs(kwargs)
158+
# self_dir = build.IncludeDirs(state.subdir, ['.'], False)
159+
# if self_dir not in include_directories:
160+
# include_directories.append(self_dir)
158161
extra_args += state.get_include_args(include_directories)
159162

160163
rescomp, rescomp_type = self._find_resource_compiler(state)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dll_res = win.compile_resources('src_dll/version.rc')
22
shared_library('lib3', 'src_dll/main.c', dll_res)
33

4-
exe_res = win.compile_resources('src_exe/version.rc')
4+
exe_res = win.compile_resources('src_exe/version.rc', include_directories: include_directories('.'))
55
executable('exe3', 'src_exe/main.c', exe_res)

test cases/windows/5 resources/res/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ myres = configure_file(input: 'myres.rc.in', output: 'myres.rc', copy: true)
44

55
res = win.compile_resources(myres,
66
depend_files: 'sample.ico',
7-
include_directories : inc,
7+
include_directories : [inc, include_directories('.')],
88
args : [['-DFOO'], '-DBAR'])
99

1010
# test that with MSVC tools, LIB/LINK invokes CVTRES with correct /MACHINE

0 commit comments

Comments
 (0)