diff options
author | Brad King <brad.king@kitware.com> | 2009-04-24 15:18:06 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2009-04-24 15:18:06 (GMT) |
commit | 708d1cf1ee9300bc9b9e26a47e1bbe1718612d6f (patch) | |
tree | da8134e5e88176619d7ffc29ec010a9035540d5e /Source/cmLocalVisualStudio6Generator.cxx | |
parent | 70b2f59c3f9c70c085966bacb1e8a41c3ad2947f (diff) | |
download | CMake-708d1cf1ee9300bc9b9e26a47e1bbe1718612d6f.zip CMake-708d1cf1ee9300bc9b9e26a47e1bbe1718612d6f.tar.gz CMake-708d1cf1ee9300bc9b9e26a47e1bbe1718612d6f.tar.bz2 |
ENH: Support more preprocessor values in VS6
Previously we rejected all preprocessor definition values containing
spaces for the VS6 IDE generator. In fact VS6 does support spaces but
not in combination with '"', '$', or ';', and only if we use the sytnax
'-DNAME="value with spaces"' instead of '-D"NAME=value with spaces"'.
Now we support all definition values that do not have one of these
invalid pairs. See issue #8779.
Diffstat (limited to 'Source/cmLocalVisualStudio6Generator.cxx')
-rw-r--r-- | Source/cmLocalVisualStudio6Generator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index 8ecfa0d..9373e31 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -1712,11 +1712,12 @@ cmLocalVisualStudio6Generator } // Now do the VS6-specific check. - if(define.find_first_of(" ") != define.npos) + if(define.find_first_of(" ") != define.npos && + define.find_first_of("\"$;") != define.npos) { cmOStringStream e; e << "WARNING: The VS6 IDE does not support preprocessor definition " - << "values with spaces.\n" + << "values with spaces and '\"', '$', or ';'.\n" << "CMake is dropping a preprocessor definition: " << define << "\n" << "Consider defining the macro in a (configured) header file.\n"; cmSystemTools::Message(e.str().c_str()); |