View Issue Details [ Jump to Notes ]

[ Print ]

Project

Category

View Status

Date Submitted

Last Update

0001041

CMake

public

2004-08-09 10:31

2004-09-17 16:29

Reporter

Kris Dekeyser

Assigned To

Bill Hoffman

Priority

normal

Severity

major

Reproducibility

always

Status

closed

Resolution

fixed

Platform

OS Version

Product Version

Target Version

Fixed in Version

Summary

0001041: _MBCS added to VS 6 projects

Description

The Visual Studio 6 dsp generator (cmLocalVisualStudio6Generator) checks for thë string "D_UNICODE" and if not set it adds "-D_MBCS" to the project definitions. Unfortunately the generator only checks the CMAKE_CXX_FLAGS for that string, not the definitions added in the CMakeLists.txt with ADD_DEFINITIONS("-D_UNICODE"). The Visual Studio 7 generator does this correctly, though. With VS 6, we end up with a project that has both "_UNICODE" and "_MBCS" set, which is wrong and gives different results, depending on the order of the definition checks.

Patch diff is:
cvs -z9 -q diff cmLocalVisualStudio6Generator.cxx (in directory D:\CVSHome\CMake\CMake\Source)
Index: cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.57
diff -r1.57 cmLocalVisualStudio6Generator.cxx
1088c1088,1090
< if(flags.find("D_UNICODE") == flags.npos)
---
> std::string defs = m_Makefile->GetDefineFlags();
> if(flags.find("D_UNICODE") == flags.npos &&
> defs.find("D_UNICODE") == flags.npos)

Issue History
Date Modified	Username	Field	Change

Notes
(0001479) Bill Hoffman (manager) 2004-09-17 15:57	fixed in cvs, thanks.

Relationships