diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-04 20:44:01 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-01-04 20:44:01 (GMT) |
| commit | f1d7a5600fab0d3cd314fd9ae059010ea6f7e5b9 (patch) | |
| tree | 864eea994d526a99eb3c10c449968d50a292d2da /Source | |
| parent | da9b5fe4b521bbb9d873cfa3ebc9c67c0d6b66bf (diff) | |
| parent | 8c7b19d35ee81afac57fe623217578191f4d034c (diff) | |
| download | CMake-f1d7a5600fab0d3cd314fd9ae059010ea6f7e5b9.zip CMake-f1d7a5600fab0d3cd314fd9ae059010ea6f7e5b9.tar.gz CMake-f1d7a5600fab0d3cd314fd9ae059010ea6f7e5b9.tar.bz2 | |
Merge topic 'add_preprocessor_def_vs2010_resources'
8c7b19d Only run resource test for MSVC compilers.
753e208 Disable incremental testing for this test, it crashes vs9 linker.
16e7d4b Add flags to resource builds on vs 2010 with a test.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 20ed5a8..ed017c7 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1133,10 +1133,13 @@ OutputIncludes(std::vector<std::string> const & includes) void cmVisualStudio10TargetGenerator:: -WriteRCOptions(std::string const& , +WriteRCOptions(std::string const& configName, std::vector<std::string> const & includes) { this->WriteString("<ResourceCompile>\n", 2); + Options& clOptions = *(this->ClOptions[configName]); + clOptions.OutputPreprocessorDefinitions(*this->BuildFileStream, " ", + "\n"); this->OutputIncludes(includes); this->WriteString("</ResourceCompile>\n", 2); } |