diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-05-16 12:59:04 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-06-02 09:56:36 (GMT) |
| commit | 35496761a58956bd8c5ad65a3ed9ee78d09af56b (patch) | |
| tree | f02c889f4da5c1da5d9a6eef5d9ea73fbc0f1a16 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | f3ad863ae6f0487bbf80d95b0d3f622840187a6a (diff) | |
| download | CMake-35496761a58956bd8c5ad65a3ed9ee78d09af56b.zip CMake-35496761a58956bd8c5ad65a3ed9ee78d09af56b.tar.gz CMake-35496761a58956bd8c5ad65a3ed9ee78d09af56b.tar.bz2 | |
Add cmLocalGenerator::GetCompileOptions.
Currently it only adds the contents of the COMPILE_FLAGS target
property, but it can be extended to handle a new COMPILE_OPTIONS
generator expression enabled property.
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 88c4deb..341ef45 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1261,8 +1261,12 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions( flags += " /TP "; } } + + std::string targetFlags; + this->LocalGenerator->GetCompileOptions(targetFlags, this->Target, + configName.c_str()); // Add the target-specific flags. - if(const char* targetFlags = this->Target->GetProperty("COMPILE_FLAGS")) + if(!targetFlags.empty()) { flags += " "; flags += targetFlags; |