diff options
author | Stefan Schmidt <s.schmidt@samsung.com> | 2020-05-18 17:46:55 +0200 |
---|---|---|
committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2020-05-26 10:15:21 +0200 |
commit | 3ca9d7282515c688f79aa7d6db34eaf33804096f (patch) | |
tree | 302b8aec11f4aeed23dd43397180b294311317af /src/lib/emotion/meson.build | |
parent | 59127058afd3f1259a0dfc438ca387fa02b72ccc (diff) |
build: lib: harmonize the use of package_c_args in all libs
Add it to subprojects which are not using it and remove and old
ELEMENTARY_BUILD define we no longer use. This allows us to have a
central place in the main meson.build file to set this variable.
Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Reviewed-by: Vincent Torri <vincent.torri@gmail.com>
Reviewed-by: João Paulo Taylor Ienczak Zanette <joao.tiz@expertisesolutions.com.br>
Differential Revision: https://phab.enlightenment.org/D11854
Diffstat (limited to 'src/lib/emotion/meson.build')
-rw-r--r-- | src/lib/emotion/meson.build | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/emotion/meson.build b/src/lib/emotion/meson.build index 6f2717dfa6..e779a39248 100644 --- a/src/lib/emotion/meson.build +++ b/src/lib/emotion/meson.build | |||
@@ -44,17 +44,18 @@ if get_option('eeze') == true | |||
44 | emotion_deps += [eeze] | 44 | emotion_deps += [eeze] |
45 | endif | 45 | endif |
46 | 46 | ||
47 | # Save in extra variable here to pass to edje_externa | ||
48 | emotion_package_c_args = package_c_args | ||
49 | |||
47 | emotion_lib = library('emotion', | 50 | emotion_lib = library('emotion', |
48 | emotion_src, pub_eo_file_target, priv_eo_file_target, | 51 | emotion_src, pub_eo_file_target, priv_eo_file_target, |
49 | dependencies: emotion_deps + emotion_pub_deps, | 52 | dependencies: emotion_deps + emotion_pub_deps, |
50 | include_directories : config_dir + [include_directories('.')], | 53 | include_directories : config_dir + [include_directories('.')], |
51 | install: true, | 54 | install: true, |
52 | c_args : package_c_args, | 55 | c_args : emotion_package_c_args, |
53 | version : meson.project_version() | 56 | version : meson.project_version() |
54 | ) | 57 | ) |
55 | 58 | ||
56 | emotion_package_c_args = package_c_args | ||
57 | |||
58 | emotion = declare_dependency( | 59 | emotion = declare_dependency( |
59 | include_directories: [include_directories('.')], | 60 | include_directories: [include_directories('.')], |
60 | link_with: emotion_lib, | 61 | link_with: emotion_lib, |