diff options
| author | GustavoLCR <gugulcr@gmail.com> | 2020-05-03 20:21:20 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 02:21:20 +0300 |
| commit | 27bbf37cf016d138c287278272a058950f15e7db (patch) | |
| tree | 3dd16126e7dcb7e735343c21d327493be90142db | |
| parent | 9a6e79dc6887890ffa6f7198032788caa065a959 (diff) | |
| download | meson-27bbf37cf016d138c287278272a058950f15e7db.zip meson-27bbf37cf016d138c287278272a058950f15e7db.tar.gz meson-27bbf37cf016d138c287278272a058950f15e7db.tar.bz2 | |
Fix incremental debug builds in VS
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 3 | ||||
| -rwxr-xr-x | run_unittests.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 80ff910..b5803bf 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -1192,7 +1192,8 @@ class Vs2010Backend(backends.Backend): # /nologo ET.SubElement(link, 'SuppressStartupBanner').text = 'true' # /release - ET.SubElement(link, 'SetChecksum').text = 'true' + if not self.environment.coredata.get_builtin_option('debug'): + ET.SubElement(link, 'SetChecksum').text = 'true' meson_file_group = ET.SubElement(root, 'ItemGroup') ET.SubElement(meson_file_group, 'None', Include=os.path.join(proj_to_src_dir, build_filename)) diff --git a/run_unittests.py b/run_unittests.py index c77c9c0..39191a3 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -5175,7 +5175,7 @@ class WindowsTests(BasePlatformTests): raise raise unittest.SkipTest('pefile module not found') testdir = os.path.join(self.common_test_dir, '6 linkshared') - self.init(testdir) + self.init(testdir, extra_args=['--buildtype=release']) self.build() # Test that binaries have a non-zero checksum env = get_fake_env() |