diff options
| author | Brad King <brad.king@kitware.com> | 2019-09-12 13:15:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-09-12 13:16:56 (GMT) |
| commit | 9602bcfc62d50d7bb302b02ae3b1f9afe941bae7 (patch) | |
| tree | 78fa402278479ea4dab743710ac47ba5a7d32e48 /Utilities | |
| parent | 1a1508c8b840ae016dc8db9da6be4cbe59d5f1aa (diff) | |
| parent | a3cfb66543d307e644e4df207f2e1305200ced02 (diff) | |
| download | CMake-9602bcfc62d50d7bb302b02ae3b1f9afe941bae7.zip CMake-9602bcfc62d50d7bb302b02ae3b1f9afe941bae7.tar.gz CMake-9602bcfc62d50d7bb302b02ae3b1f9afe941bae7.tar.bz2 | |
Merge topic 'compile-msvc-permissive-off'
a3cfb66543 Add compatibility with the cl.exe /permissive- compiler option
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3803
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp index 4b17875..593822a 100644 --- a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp +++ b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp @@ -10,7 +10,8 @@ std::wstring get_property(MSIHANDLE msi_handle, std::wstring const& name) { DWORD size = 0; - UINT status = MsiGetPropertyW(msi_handle, name.c_str(), L"", &size); + WCHAR value_buffer[] = L""; + UINT status = MsiGetPropertyW(msi_handle, name.c_str(), value_buffer, &size); if (status == ERROR_MORE_DATA) { std::vector<wchar_t> buffer(size + 1); |