diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-05-26 21:30:13 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-05-26 21:30:13 (GMT) |
| commit | 17da34e188ef6e06f8bd1f9fb3bdccbcaead96e6 (patch) | |
| tree | 2c395f453b6ee551901e4e1707943b868eeb6e52 | |
| parent | b0a97bc01429be360eea7d3e7800a2af97c67f23 (diff) | |
| download | CMake-17da34e188ef6e06f8bd1f9fb3bdccbcaead96e6.zip CMake-17da34e188ef6e06f8bd1f9fb3bdccbcaead96e6.tar.gz CMake-17da34e188ef6e06f8bd1f9fb3bdccbcaead96e6.tar.bz2 | |
COMP: Fix for support of VS 8.0 beta 2
| -rw-r--r-- | Modules/CMakeVS8FindMake.cmake | 2 | ||||
| -rw-r--r-- | Source/MFCDialog/CMakeSetupDialog.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Modules/CMakeVS8FindMake.cmake b/Modules/CMakeVS8FindMake.cmake index ec3a3ca..59d38b1 100644 --- a/Modules/CMakeVS8FindMake.cmake +++ b/Modules/CMakeVS8FindMake.cmake @@ -1,5 +1,5 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM - NAMES VCExpress + NAMES devenv VCExpress PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VS;EnvironmentDirectory] [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup;Dbghelp_path] diff --git a/Source/MFCDialog/CMakeSetupDialog.cpp b/Source/MFCDialog/CMakeSetupDialog.cpp index fc2a6dd..594d060 100644 --- a/Source/MFCDialog/CMakeSetupDialog.cpp +++ b/Source/MFCDialog/CMakeSetupDialog.cpp @@ -1269,8 +1269,9 @@ int CMakeSetupDialog::CreateShortcut() } // Ensure that the string consists of ANSI characters. - WORD wsz[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, link_name, -1, wsz, MAX_PATH); + WORD wszAr[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. hres = ppf->Save(wsz, TRUE); |