diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-30 13:18:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-08-30 13:18:58 (GMT) |
| commit | d879999534d01451618395749287b5342e60783b (patch) | |
| tree | fc1f0ceaa4c02d6deed2c3ca56f7137b85ef77e6 /Source/cmServerProtocol.cxx | |
| parent | 17a60e398c8287aaa47d2e424189e8ba4a039aeb (diff) | |
| parent | 65ab9ce93882070191ad84fe96239e50d0b62b6e (diff) | |
| download | CMake-d879999534d01451618395749287b5342e60783b.zip CMake-d879999534d01451618395749287b5342e60783b.tar.gz CMake-d879999534d01451618395749287b5342e60783b.tar.bz2 | |
Merge topic 'genex-evaluate-stdstring'
65ab9ce938 Genex: Return Evaluate results as const std::string&
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2314
Diffstat (limited to 'Source/cmServerProtocol.cxx')
| -rw-r--r-- | Source/cmServerProtocol.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index 76d837a..31101e4 100644 --- a/Source/cmServerProtocol.cxx +++ b/Source/cmServerProtocol.cxx @@ -728,7 +728,7 @@ static Json::Value DumpSourceFilesList( const std::string INCLUDE_DIRECTORIES("INCLUDE_DIRECTORIES"); if (const char* cincludes = file->GetProperty(INCLUDE_DIRECTORIES)) { - const char* evaluatedIncludes = + const std::string& evaluatedIncludes = genexInterpreter.Evaluate(cincludes, INCLUDE_DIRECTORIES); lg->AppendIncludeDirectories(includes, evaluatedIncludes, *file); |