diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-12-21 23:06:14 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-12-21 23:06:14 +0200 |
| commit | 27d4a611a54251dfab968e3cb111d8cbd6b88254 (patch) | |
| tree | 9e7f62bc3999300a0a975a6ab134a3bddc47446f | |
| parent | 34c03719a304bbbf684ad99110f49c18c99d9542 (diff) | |
| download | meson-27d4a611a54251dfab968e3cb111d8cbd6b88254.zip meson-27d4a611a54251dfab968e3cb111d8cbd6b88254.tar.gz meson-27d4a611a54251dfab968e3cb111d8cbd6b88254.tar.bz2 | |
Fix Windows.
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 1 | ||||
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 3fb37ea..c020458 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1798,6 +1798,7 @@ rule FORTRAN_DEP_HACK args = [x.replace("@CURRENT_SOURCE_DIR@", source_target_dir) for x in args] args = [x.replace("@SOURCE_ROOT@", self.build_to_src).replace("@BUILD_ROOT@", '.') for x in args] + args = [x.replace('\\', '/') for x in args] return args def generate_genlist_for_target(self, genlist, target, outfile): diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 1720569..b53bd17 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -103,7 +103,7 @@ class Vs2010Backend(backends.Backend): exe = generator.get_exe() infilelist = genlist.get_inputs() outfilelist = genlist.get_outputs() - source_dir = os.path.join(self.environment.get_source_dir(), genlist.subdir) + source_dir = os.path.join(self.build_to_src, genlist.subdir) exe_arr = self.exe_object_to_cmd_array(exe) idgroup = ET.SubElement(parent_node, 'ItemGroup') for i in range(len(infilelist)): @@ -123,10 +123,11 @@ 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("@CURRENT_SOURCE_DIR@", source_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] + args = [x.replace('\\', '/') for x in args] cmd = exe_arr + self.replace_extra_args(args, genlist) if generator.capture: exe_data = self.serialize_executable( |