diff options
| author | Shigeki Ohtsu <ohtsu@iij.ad.jp> | 2015-03-30 14:33:17 +0900 |
|---|---|---|
| committer | Shigeki Ohtsu <ohtsu@iij.ad.jp> | 2015-04-04 11:01:26 +0900 |
| commit | 21f4fb62157567eb6e1eac08927d832c7b5b89dd (patch) | |
| tree | a0f9f81df66f9ba9d2a925c6ce0d15954db57ffa /tools/gyp/pylib/gyp/generator/cmake.py | |
| parent | efadffe8616b895cd67fd270eadbd241d1069a47 (diff) | |
| download | android-node-v8-21f4fb62157567eb6e1eac08927d832c7b5b89dd.tar.gz android-node-v8-21f4fb62157567eb6e1eac08927d832c7b5b89dd.tar.bz2 android-node-v8-21f4fb62157567eb6e1eac08927d832c7b5b89dd.zip | |
deps: update gyp to e1c8fcf7
PR-URL: https://github.com/iojs/io.js/pull/1325
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'tools/gyp/pylib/gyp/generator/cmake.py')
| -rw-r--r-- | tools/gyp/pylib/gyp/generator/cmake.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/gyp/pylib/gyp/generator/cmake.py b/tools/gyp/pylib/gyp/generator/cmake.py index 10d015ee83..8f5feddee1 100644 --- a/tools/gyp/pylib/gyp/generator/cmake.py +++ b/tools/gyp/pylib/gyp/generator/cmake.py @@ -216,7 +216,7 @@ def WriteVariable(output, variable_name, prepend=None): output.write('}') -class CMakeTargetType: +class CMakeTargetType(object): def __init__(self, command, modifier, property_modifier): self.command = command self.modifier = modifier @@ -464,7 +464,7 @@ def WriteCopies(target_name, copies, extra_deps, path_to_gyp, output): extra_deps.append(copy_name) return - class Copy: + class Copy(object): def __init__(self, ext, command): self.cmake_inputs = [] self.cmake_outputs = [] @@ -743,7 +743,7 @@ def WriteTarget(namer, qualified_target, target_dicts, build_dir, config_to_use, if target_output_directory is None: if target_type in ('executable', 'loadable_module'): target_output_directory = generator_default_variables['PRODUCT_DIR'] - elif target_type in ('shared_library'): + elif target_type == 'shared_library': target_output_directory = '${builddir}/lib.${TOOLSET}' elif spec.get('standalone_static_library', False): target_output_directory = generator_default_variables['PRODUCT_DIR'] |