dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: prepend in case the environment variable already exists. 

The common order logic for list of directories in environment variables is that
left paths have precedence. This is at least the case for LD_LIBRARY_PATH (and
probably GI_TYPELIB_PATH too).
Make sure that our local libraries and introspected binaries (in the build
directory) are used and not any version installed on the system or by previous
`ninja install` calls.
This commit is contained in:
Jehan 2023-06-27 20:36:20 +02:00
parent 757adf94bb
commit 8db25f2246
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build/windows/installer/meson.build
View File

@ -12,15 +12,15 @@ env.set('GIMP_TESTING_PLUGINDIRS', meson.project_build_root() / 'plug-ins:')
env.append('GIMP_TESTING_PLUGINDIRS', meson.project_build_root() / 'plug-ins/python')
env.append('GIMP_TESTING_PLUGINDIRS', meson.project_build_root() / 'plug-ins/common/test-plug-ins/')
env.append('GI_TYPELIB_PATH', meson.project_build_root() / 'libgimp')
env.append('LD_LIBRARY_PATH', meson.project_build_root() / 'libgimp')
env.append('LD_LIBRARY_PATH', meson.project_build_root() / 'libgimpbase')
env.append('LD_LIBRARY_PATH', meson.project_build_root() / 'libgimpcolor')
env.append('LD_LIBRARY_PATH', meson.project_build_root() / 'libgimpconfig')
env.append('LD_LIBRARY_PATH', meson.project_build_root() / 'libgimpmath')
env.append('LD_LIBRARY_PATH', meson.project_build_root() / 'libgimpmodule')
env.append('LD_LIBRARY_PATH', meson.project_build_root() / 'libgimpthumb')
env.append('LD_LIBRARY_PATH', meson.project_build_root() / 'libgimpwidgets')
env.prepend('GI_TYPELIB_PATH', meson.project_build_root() / 'libgimp')
env.prepend('LD_LIBRARY_PATH', meson.project_build_root() / 'libgimp')
env.prepend('LD_LIBRARY_PATH', meson.project_build_root() / 'libgimpbase')
env.prepend('LD_LIBRARY_PATH', meson.project_build_root() / 'libgimpcolor')
env.prepend('LD_LIBRARY_PATH', meson.project_build_root() / 'libgimpconfig')
env.prepend('LD_LIBRARY_PATH', meson.project_build_root() / 'libgimpmath')
env.prepend('LD_LIBRARY_PATH', meson.project_build_root() / 'libgimpmodule')
env.prepend('LD_LIBRARY_PATH', meson.project_build_root() / 'libgimpthumb')
env.prepend('LD_LIBRARY_PATH', meson.project_build_root() / 'libgimpwidgets')
if enable_console_bin
gimp_exe=gimpconsole_exe