summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2018-03-28 13:57:20 -0700
committerMarcel Hollerbach <marcel@osg.samsung.com>2018-03-28 14:28:52 -0700
commitabf43d1231b2089bd26fc1b8a7cadf3e83efe056 (patch)
treee832f316b2c7fded396cda9eae3d03d52faec472
parent3f433547d4204b06e94176bace2fbd6a5ff8b8e7 (diff)
meson: maintain 3 sys variablesfeature/meson
3 variables for: - execution suffix - library suffix - module suffix for macos we need to set the suffix for the shared module by hand, caused by the fact that meson does not build a module as .so but as dylib
-rw-r--r--header_checks/meson.build1
-rw-r--r--meson.build14
-rw-r--r--src/modules/ecore_evas/meson.build5
-rw-r--r--src/modules/ecore_imf/meson.build2
-rw-r--r--src/modules/eeze/meson.build2
-rw-r--r--src/modules/evas/meson.build10
6 files changed, 21 insertions, 13 deletions
diff --git a/header_checks/meson.build b/header_checks/meson.build
index 2e4de1a5d1..c8c63cda1c 100644
--- a/header_checks/meson.build
+++ b/header_checks/meson.build
@@ -163,7 +163,6 @@ config_h.set('VMAJ', version_major)
163config_h.set('VMIN', version_minor) 163config_h.set('VMIN', version_minor)
164config_h.set('VMIC', version_micro) 164config_h.set('VMIC', version_micro)
165config_h.set('VREV', '0') 165config_h.set('VREV', '0')
166config_h.set_quoted('SHARED_LIB_SUFFIX', '.so')
167 166
168#jpeg detection ... life is a bit more complex there 167#jpeg detection ... life is a bit more complex there
169 168
diff --git a/meson.build b/meson.build
index 18e7cc1a8a..b858352b1a 100644
--- a/meson.build
+++ b/meson.build
@@ -91,13 +91,21 @@ config_dir = [include_directories('.')]
91eolian_include_directories = [] 91eolian_include_directories = []
92 92
93if target_machine.system() == 'linux' or target_machine.system() == 'bsd' 93if target_machine.system() == 'linux' or target_machine.system() == 'bsd'
94 sys_lib_extension = '.so' 94 sys_lib_extension = 'so'
95 sys_exe_extension = ''
96 sys_mod_extension = 'so'
95elif target_machine.system() == 'windows' or target_machine.system() == 'cygwin' 97elif target_machine.system() == 'windows' or target_machine.system() == 'cygwin'
96 sys_lib_extension = '.dll' 98 sys_lib_extension = 'dll'
99 sys_exe_extension = 'exe'
100 sys_mod_extension = 'dll'
97elif target_machine.system() == 'darwin' 101elif target_machine.system() == 'darwin'
98 sys_lib_extension = '.dylib' 102 sys_lib_extension = 'dylib'
103 sys_exe_extension = ''
104 sys_mod_extension = 'so'
99endif 105endif
100 106
107config_h.set_quoted('SHARED_LIB_SUFFIX', '.'+sys_lib_extension)
108
101subdir('header_checks') 109subdir('header_checks')
102 110
103if get_option('ecore_wl2') == true or get_option('ecore_buffer') == true 111if get_option('ecore_wl2') == true or get_option('ecore_buffer') == true
diff --git a/src/modules/ecore_evas/meson.build b/src/modules/ecore_evas/meson.build
index d58f7489f8..18196ccf44 100644
--- a/src/modules/ecore_evas/meson.build
+++ b/src/modules/ecore_evas/meson.build
@@ -34,8 +34,9 @@ foreach engine_conf : engines
34 include_directories : config_dir + [engine_include_dir], 34 include_directories : config_dir + [engine_include_dir],
35 dependencies : [eina, ecore_evas, ecore_input_evas] + engine_deps, 35 dependencies : [eina, ecore_evas, ecore_input_evas] + engine_deps,
36 install : true, 36 install : true,
37 install_dir : mod_install_dir 37 install_dir : mod_install_dir,
38 name_suffix : sys_mod_extension
38 ) 39 )
39 module_files += join_paths(mod_install_dir, 'lib'+mod_full_name+sys_lib_extension) 40 module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
40 endif 41 endif
41endforeach \ No newline at end of file 42endforeach \ No newline at end of file
diff --git a/src/modules/ecore_imf/meson.build b/src/modules/ecore_imf/meson.build
index 1dd4299188..94a26c9746 100644
--- a/src/modules/ecore_imf/meson.build
+++ b/src/modules/ecore_imf/meson.build
@@ -28,6 +28,6 @@ foreach mod_name : mods
28 install: true, 28 install: true,
29 install_dir : mod_install_dir 29 install_dir : mod_install_dir
30 ) 30 )
31 module_files += join_paths(mod_install_dir, 'lib'+mod_name+sys_lib_extension) 31 module_files += join_paths(mod_install_dir, 'lib'+mod_name+'.'+sys_lib_extension)
32 32
33endforeach 33endforeach
diff --git a/src/modules/eeze/meson.build b/src/modules/eeze/meson.build
index c10194cbd5..11b4c79781 100644
--- a/src/modules/eeze/meson.build
+++ b/src/modules/eeze/meson.build
@@ -13,5 +13,5 @@ foreach sensor_conf : sensors
13 install : true, 13 install : true,
14 install_dir : join_paths(dir_package_modules, 'sensor', sensor, module_arch) 14 install_dir : join_paths(dir_package_modules, 'sensor', sensor, module_arch)
15 ) 15 )
16 module_files += join_paths(dir_package_modules, 'sensor', sensor, module_arch, 'libeeze_' + sensor + sys_lib_extension) 16 module_files += join_paths(dir_package_modules, 'sensor', sensor, module_arch, 'libeeze_' + sensor + '.' + sys_lib_extension)
17endforeach \ No newline at end of file 17endforeach \ No newline at end of file
diff --git a/src/modules/evas/meson.build b/src/modules/evas/meson.build
index e897608499..ecda300f43 100644
--- a/src/modules/evas/meson.build
+++ b/src/modules/evas/meson.build
@@ -82,22 +82,22 @@ foreach engine_conf : engines
82 ) 82 )
83 if engine == 'gl_generic' 83 if engine == 'gl_generic'
84 #special case, see evas_module.c 84 #special case, see evas_module.c
85 config_h.set('EVAS_STATIC_BUILD_GL_COMMON', value) 85 config_h.set('EVAS_STATIC_BUILD_GL_COMMON', '1')
86 else 86 else
87 config_h.set('EVAS_STATIC_BUILD_'+engine.to_upper(), '1') 87 config_h.set('EVAS_STATIC_BUILD_'+engine.to_upper(), '1')
88 endif 88 endif
89 89
90 endif 90 endif
91
92 else 91 else
93 shared_module(mod_full_name, engine_src, 92 shared_module(mod_full_name, engine_src,
94 include_directories : config_dir + [engine_include_dir], 93 include_directories : config_dir + [engine_include_dir],
95 dependencies : [eina, evas_pre] + engine_deps, 94 dependencies : [eina, evas_pre] + engine_deps,
96 install : true, 95 install : true,
97 install_dir : mod_install_dir 96 install_dir : mod_install_dir,
97 name_suffix : sys_mod_extension
98 ) 98 )
99 module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + sys_lib_extension) 99 module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
100 endif 100 endif
101 config_h.set('BUILD_ENGINE_'+engine.to_upper(), '1') 101 config_h.set('BUILD_ENGINE_'+engine.to_upper(), '1')
102 endif 102 endif
103endforeach \ No newline at end of file 103endforeach