aboutsummaryrefslogtreecommitdiffstats
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
parentmeson: enable beta flags for objective c (diff)
downloadefl-feature/meson.tar.gz
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)
config_h.set('VMIN', version_minor)
config_h.set('VMIC', version_micro)
config_h.set('VREV', '0')
-config_h.set_quoted('SHARED_LIB_SUFFIX', '.so')
#jpeg detection ... life is a bit more complex there
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('.')]
eolian_include_directories = []
if target_machine.system() == 'linux' or target_machine.system() == 'bsd'
- sys_lib_extension = '.so'
+ sys_lib_extension = 'so'
+ sys_exe_extension = ''
+ sys_mod_extension = 'so'
elif target_machine.system() == 'windows' or target_machine.system() == 'cygwin'
- sys_lib_extension = '.dll'
+ sys_lib_extension = 'dll'
+ sys_exe_extension = 'exe'
+ sys_mod_extension = 'dll'
elif target_machine.system() == 'darwin'
- sys_lib_extension = '.dylib'
+ sys_lib_extension = 'dylib'
+ sys_exe_extension = ''
+ sys_mod_extension = 'so'
endif
+config_h.set_quoted('SHARED_LIB_SUFFIX', '.'+sys_lib_extension)
+
subdir('header_checks')
if 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
include_directories : config_dir + [engine_include_dir],
dependencies : [eina, ecore_evas, ecore_input_evas] + engine_deps,
install : true,
- install_dir : mod_install_dir
+ install_dir : mod_install_dir,
+ name_suffix : sys_mod_extension
)
- module_files += join_paths(mod_install_dir, 'lib'+mod_full_name+sys_lib_extension)
+ module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
endif
endforeach \ 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
install: true,
install_dir : mod_install_dir
)
- module_files += join_paths(mod_install_dir, 'lib'+mod_name+sys_lib_extension)
+ module_files += join_paths(mod_install_dir, 'lib'+mod_name+'.'+sys_lib_extension)
endforeach
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
install : true,
install_dir : join_paths(dir_package_modules, 'sensor', sensor, module_arch)
)
- module_files += join_paths(dir_package_modules, 'sensor', sensor, module_arch, 'libeeze_' + sensor + sys_lib_extension)
+ module_files += join_paths(dir_package_modules, 'sensor', sensor, module_arch, 'libeeze_' + sensor + '.' + sys_lib_extension)
endforeach \ 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
)
if engine == 'gl_generic'
#special case, see evas_module.c
- config_h.set('EVAS_STATIC_BUILD_GL_COMMON', value)
+ config_h.set('EVAS_STATIC_BUILD_GL_COMMON', '1')
else
config_h.set('EVAS_STATIC_BUILD_'+engine.to_upper(), '1')
endif
endif
-
else
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
dependencies : [eina, evas_pre] + engine_deps,
install : true,
- install_dir : mod_install_dir
+ install_dir : mod_install_dir,
+ name_suffix : sys_mod_extension
)
- module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + sys_lib_extension)
+ module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension)
endif
config_h.set('BUILD_ENGINE_'+engine.to_upper(), '1')
endif
-endforeach \ No newline at end of file
+endforeach