diff options
| author | Marc Chevrier <marc.chevrier@sap.com> | 2017-12-01 16:10:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-12-04 14:10:09 (GMT) |
| commit | 6bffc13ef1c85ec565273d25e811fd6c326533f0 (patch) | |
| tree | 752484518da79d7edfe4ba98880f1ce7d694478c /Source/cmLocalVisualStudio7Generator.cxx | |
| parent | a4faf8638744edf7e3dd8931b55ba87e8f7738be (diff) | |
| download | CMake-6bffc13ef1c85ec565273d25e811fd6c326533f0.zip CMake-6bffc13ef1c85ec565273d25e811fd6c326533f0.tar.gz CMake-6bffc13ef1c85ec565273d25e811fd6c326533f0.tar.bz2 | |
Refactor per-source generator expression evaluation
Prepare to add generator expression support to more source properties.
Factor out some duplicated code into a helper to avoid further
duplication.
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index f01ed7a..999c1f5 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -1456,15 +1456,14 @@ cmLocalVisualStudio7GeneratorFCInfo::cmLocalVisualStudio7GeneratorFCInfo( i != configs.end(); ++i, ++ci) { std::string configUpper = cmSystemTools::UpperCase(*i); cmLVS7GFileConfig fc; + cmGeneratorExpressionInterpreter genexInterpreter(lg, gt, *i); bool needfc = false; if (!objectName.empty()) { fc.ObjectName = objectName; needfc = true; } if (const char* cflags = sf.GetProperty("COMPILE_FLAGS")) { - cmGeneratorExpression ge; - std::unique_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(cflags); - fc.CompileFlags = cge->Evaluate(lg, *i, false, gt); + fc.CompileFlags = genexInterpreter.Evaluate(cflags); needfc = true; } if (lg->FortranProject) { |