diff options
| author | Brad King <brad.king@kitware.com> | 2011-06-07 18:04:00 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-06-07 18:04:00 (GMT) |
| commit | 313a633b85adcf6c69120dcec8e4685371549ce0 (patch) | |
| tree | 9a0ff390eb5b517205acc16de88407d66eb13978 /Source | |
| parent | f0d36581025fb83c0cfdd7cf9ade28dd1de5f8ea (diff) | |
| parent | 27aa446352b882c7bbda269a3770fec8fa24eb57 (diff) | |
| download | CMake-313a633b85adcf6c69120dcec8e4685371549ce0.zip CMake-313a633b85adcf6c69120dcec8e4685371549ce0.tar.gz CMake-313a633b85adcf6c69120dcec8e4685371549ce0.tar.bz2 | |
Merge topic 'vs10_include_fix'
27aa446 One more try. Use full path by default, and relative on broken compilers.
2dfc121 Use bin tree for inclues to avoid -I with spaces in the path.
6d29b4b Append and do not clobber CMAKE_CXX_FLAGS in the test.
7815e90 Fix for bug#10798. VS10 did not append -I flags with COMPILE_FLAGS prop.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudioGeneratorOptions.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx index ed0d60c..ae496ad 100644 --- a/Source/cmVisualStudioGeneratorOptions.cxx +++ b/Source/cmVisualStudioGeneratorOptions.cxx @@ -299,7 +299,12 @@ cmVisualStudioGeneratorOptions { fout << "<" << m->first << ">"; } - fout << m->second << "</" << m->first << ">\n"; + fout << m->second; + if (m->first == "AdditionalIncludeDirectories") + { + fout << ";%(AdditionalIncludeDirectories)"; + } + fout << "</" << m->first << ">\n"; } } else |