aboutsummaryrefslogtreecommitdiff
path: root/build.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-06-20 13:45:25 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2015-06-20 13:45:25 +0300
commit0e81077817bb91c27a51d881bf92dbf4b2d1ac53 (patch)
tree9cce95b0fd17c76376280f39a915fd177f24b9e0 /build.py
parent6d7ad208d5241627f9d1b28ac500e29617de1fef (diff)
downloadmeson-0e81077817bb91c27a51d881bf92dbf4b2d1ac53.zip
meson-0e81077817bb91c27a51d881bf92dbf4b2d1ac53.tar.gz
meson-0e81077817bb91c27a51d881bf92dbf4b2d1ac53.tar.bz2
Moved shared library version checking from base class to sharedlibrary. Closes #170.
Diffstat (limited to 'build.py')
-rw-r--r--build.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/build.py b/build.py
index ee42f81..7e17907 100644
--- a/build.py
+++ b/build.py
@@ -311,10 +311,6 @@ class BuildTarget():
for i in self.link_depends:
if not isinstance(i, str):
raise InvalidArguments('Link_depends arguments must be strings.')
- if 'version' in kwargs:
- self.set_version(kwargs['version'])
- if 'soversion' in kwargs:
- self.set_soversion(kwargs['soversion'])
inclist = kwargs.get('include_directories', [])
if not isinstance(inclist, list):
inclist = [inclist]
@@ -615,6 +611,13 @@ class SharedLibrary(BuildTarget):
self.suffix = environment.get_shared_lib_suffix()
self.importsuffix = environment.get_import_lib_suffix()
+ def process_kwargs(self, kwargs, environment):
+ super().process_kwargs(kwargs, environment)
+ if 'version' in kwargs:
+ self.set_version(kwargs['version'])
+ if 'soversion' in kwargs:
+ self.set_soversion(kwargs['soversion'])
+
def check_unknown_kwargs(self, kwargs):
self.check_unknown_kwargs_int(kwargs, known_shlib_kwargs)
@@ -642,7 +645,6 @@ class SharedLibrary(BuildTarget):
def set_version(self, version):
if not isinstance(version, str):
- print(version)
raise InvalidArguments('Shared library version is not a string.')
self.version = version