aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/vs2010backend.py
diff options
context:
space:
mode:
authorAlberto Aguirre <alberto.aguirre@canonical.com>2017-04-14 08:18:37 -0500
committerJussi Pakkanen <jpakkane@gmail.com>2017-05-08 20:53:57 +0200
commitccab7d64f474f00e010b2c6601e63d8034c5552a (patch)
tree2007c7528dd669cb70195aa2ec5524cf300b0359 /mesonbuild/backend/vs2010backend.py
parent1882548f056a49945de2c3b4b7d57d283cecb012 (diff)
downloadmeson-ccab7d64f474f00e010b2c6601e63d8034c5552a.zip
meson-ccab7d64f474f00e010b2c6601e63d8034c5552a.tar.gz
meson-ccab7d64f474f00e010b2c6601e63d8034c5552a.tar.bz2
Add support for @CURRENT_SOURCE_DIR@ in generator arguments
Allow users to specify @CURRENT_SOURCE_DIR@ in generator arguments to specify the current target source directory. This is useful when creating protobuf generator objects in sub-directories because protoc will then generate files in the expected location. Fixes #1622. Remove stray semicolon Update documentation
Diffstat (limited to 'mesonbuild/backend/vs2010backend.py')
-rw-r--r--mesonbuild/backend/vs2010backend.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index e910a03..533edf0 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -120,6 +120,7 @@ class Vs2010Backend(backends.Backend):
custom_target_include_dirs = []
custom_target_output_files = []
target_private_dir = self.relpath(self.get_target_private_dir(target), self.get_target_dir(target))
+ source_target_dir = self.get_target_source_dir(target)
down = self.target_to_build_root(target)
for genlist in target.get_generated_sources():
if isinstance(genlist, build.CustomTarget):
@@ -154,6 +155,7 @@ class Vs2010Backend(backends.Backend):
args = [x.replace("@SOURCE_DIR@", self.environment.get_source_dir())
.replace("@BUILD_DIR@", target_private_dir)
for x in args]
+ args = [x.replace("@CURRENT_SOURCE_DIR@", source_target_dir) for x in args]
args = [x.replace("@SOURCE_ROOT@", self.environment.get_source_dir())
.replace("@BUILD_ROOT@", self.environment.get_build_dir())
for x in args]