meson: pass the executable name to gimp-data to build gimp.ico.

Note that the executables are not built yet at this point, but we just need to
pass the name for configuration. The gimp.ico generation step is run manually
anyway and requires a fully functional and installed GIMP.

See commit gimp-data@40d4822.

app/meson.build

@@ -198,7 +198,7 @@ else
 endif
 
 if enable_console_bin
-  gimpconsole_exe = executable('gimp-console' + exec_ver,
+  gimpconsole_exe = executable(gimpconsole_exe_name,
     'main.c',
     libapp_sources,
     console_rc_file,
@@ -217,7 +217,7 @@ if enable_console_bin
   )
 endif
 
-gimpmain_exe = executable('gimp' + exec_ver,
+gimpmain_exe = executable(gimpmain_exe_name,
   'main.c',
   gui_rc_file,
   c_args: libapp_c_args,

meson.build

@@ -104,6 +104,9 @@ prefix    = get_option('prefix')
 buildtype = get_option('buildtype')
 exec_ver  = '-' + gimp_app_version
 
+gimpconsole_exe_name = 'gimp-console' + exec_ver
+gimpmain_exe_name    = 'gimp' + exec_ver
+
 compiler_args = []
 linker_args = []
 
@@ -1818,10 +1821,17 @@ subdir('etc')
 subdir('menus')
 subdir('themes')
 
+if enable_console_bin
+  gimp_exe_name=gimpconsole_exe_name
+else
+  gimp_exe_name=gimpmain_exe_name
+endif
+
 # Loading gimp-data subproject, the versions must be in sync.
 gimp_data = subproject('gimp-data', version: '=' + gimp_version,
                        default_options: [
                          'gimp-datadir=' + gimpdatadir,
+                         'gimp-exe='     + gimp_exe_name,
                        ])
 icons_imgs_sources = gimp_data.get_variable('icons_imgs_sources')
 icons_core_sources = gimp_data.get_variable('icons_core_sources')