kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: Fix for support of VS 8.0 beta 2

This commit is contained in:
Andy Cedilnik 2005-05-26 17:30:13 -04:00
parent b0a97bc014
commit 17da34e188
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CMakeVS8FindMake.cmake
View File

@ -1,5 +1,5 @@
FIND_PROGRAM(CMAKE_MAKE_PROGRAM FIND_PROGRAM(CMAKE_MAKE_PROGRAM
NAMES VCExpress NAMES devenv VCExpress
PATHS PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VS;EnvironmentDirectory] [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VS;EnvironmentDirectory]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup;Dbghelp_path] [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup;Dbghelp_path]

5
Source/MFCDialog/CMakeSetupDialog.cpp
View File

@ -1269,8 +1269,9 @@ int CMakeSetupDialog::CreateShortcut()
} }
// Ensure that the string consists of ANSI characters. // Ensure that the string consists of ANSI characters.
WORD wsz[MAX_PATH]; WORD wszAr[MAX_PATH];
MultiByteToWideChar(CP_ACP, 0, link_name, -1, wsz, MAX_PATH); LPWSTR wsz = (LPWSTR)wszAr;
MultiByteToWideChar(CP_ACP, 0, link_name, -1, (LPWSTR)(wsz), MAX_PATH);
// Save the shortcut via the IPersistFile::Save member function. // Save the shortcut via the IPersistFile::Save member function.
hres = ppf->Save(wsz, TRUE); hres = ppf->Save(wsz, TRUE);