summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2019-12-26 15:15:39 +0800
committerKjell Ahlstedt <kjellahlstedt@gmail.com>2019-12-29 18:11:52 +0100
commit4caa717f4723d2e814c61c7be7d63791aabf2757 (patch)
tree47296954ccb2f6758d42ef67beb6a9c189db49f6
parent82005b8f65e65d8ea9544cb26a007f8c1c6ca27d (diff)
downloadsigc++-4caa717f4723d2e814c61c7be7d63791aabf2757.tar.gz
meson/Windows: Fix builds when builddir is a subdir of source tree
It appears that Meson did not construct the paths properly for shutil.copy2() when building in a build directory that is a subdirectory of the sources, when using meson.current_build_dir(), possibly due how path separators are handled. Fix this by constructing the paths using project_build_root / 'MSVC_NMake'.
-rw-r--r--MSVC_NMake/meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/MSVC_NMake/meson.build b/MSVC_NMake/meson.build
index 89db786..e9964ca 100644
--- a/MSVC_NMake/meson.build
+++ b/MSVC_NMake/meson.build
@@ -13,5 +13,5 @@ configure_file(
cmd_py = '''
import shutil
shutil.copy2("@0@", "@1@")
-'''.format(project_build_root / 'sigc++config.h', meson.current_build_dir())
+'''.format(project_build_root / 'sigc++config.h', project_build_root / 'MSVC_NMake')
meson.add_postconf_script(python3.path(), '-c', cmd_py)