diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-05 13:15:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-12-05 13:15:40 (GMT) |
| commit | 729dda542010ed584d08630d2e5ab1ff3129e5e8 (patch) | |
| tree | 35d7dfbbe0608c7546b6d1a539186f8d72f02371 /Source/cmLocalVisualStudio7Generator.cxx | |
| parent | 0236e5080229e5ce05c43077a56dc5b58fc644fd (diff) | |
| parent | 6bffc13ef1c85ec565273d25e811fd6c326533f0 (diff) | |
| download | CMake-729dda542010ed584d08630d2e5ab1ff3129e5e8.zip CMake-729dda542010ed584d08630d2e5ab1ff3129e5e8.tar.gz CMake-729dda542010ed584d08630d2e5ab1ff3129e5e8.tar.bz2 | |
Merge topic 'src-genex-refactoring'
6bffc13e Refactor per-source generator expression evaluation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1550
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 d2c62be..e5c8317 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -1458,15 +1458,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) { |