diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-12 13:38:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-12 13:38:37 (GMT) |
| commit | 708b3fecfe4ea4f92f49bb5eea5c9eed370a5956 (patch) | |
| tree | 50c7e6cf706b03cf6364776a3b2d5d920e24164a /Source/QtDialog | |
| parent | 1c1a1e08e82626aaf53ec0285ff4eabdb75d6d71 (diff) | |
| parent | 13d10ee61642ab384d506fa81a991e51d90c6488 (diff) | |
| download | CMake-708b3fecfe4ea4f92f49bb5eea5c9eed370a5956.zip CMake-708b3fecfe4ea4f92f49bb5eea5c9eed370a5956.tar.gz CMake-708b3fecfe4ea4f92f49bb5eea5c9eed370a5956.tar.bz2 | |
Merge topic 'gicv-stdstring'
13d10ee616 cmState::GetInitializedCacheValue: Return as const std::string*
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2365
Diffstat (limited to 'Source/QtDialog')
| -rw-r--r-- | Source/QtDialog/QCMake.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx index 0e14a3f..0133b88 100644 --- a/Source/QtDialog/QCMake.cxx +++ b/Source/QtDialog/QCMake.cxx @@ -94,11 +94,11 @@ void QCMake::setBinaryDirectory(const QString& _dir) } const char* gen = state->GetCacheEntryValue("CMAKE_GENERATOR"); if (gen) { - const char* extraGen = + const std::string* extraGen = state->GetInitializedCacheValue("CMAKE_EXTRA_GENERATOR"); std::string curGen = cmExternalMakefileProjectGenerator::CreateFullGeneratorName( - gen, extraGen ? extraGen : ""); + gen, extraGen ? *extraGen : ""); this->setGenerator(QString::fromLocal8Bit(curGen.c_str())); } |