diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2021-09-10 13:47:23 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-09-10 09:47:39 -0400 |
| commit | 9488f8a7b7c4b4f180d16cde8a819a7a5216ef56 (patch) | |
| tree | 1c90c2fec972d3d1589e580a55b8a04bff9e74a6 /Source/cmGlobalGenerator.cxx | |
| parent | 293070c325ec4cb91668dbe75dd259b7dfb0aa7d (diff) | |
| parent | f84193292cb36e26d13a3f1f56a1539f088e8827 (diff) | |
| download | cmake-9488f8a7b7c4b4f180d16cde8a819a7a5216ef56.tar.gz | |
Merge topic 'enh-AddCacheEntry-accepts-new-types'
f84193292c Use new AddCacheEntry signatures
3c2e58eeb8 AddCacheEntry accept cmProp or std::string
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6495
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 17cd95e562..fd1a197ce3 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -2185,9 +2185,8 @@ void cmGlobalGenerator::EnableLanguagesFromGenerator(cmGlobalGenerator* gen, this->TryCompileOuterMakefile = mf; cmProp make = gen->GetCMakeInstance()->GetCacheDefinition("CMAKE_MAKE_PROGRAM"); - this->GetCMakeInstance()->AddCacheEntry("CMAKE_MAKE_PROGRAM", cmToCStr(make), - "make program", - cmStateEnums::FILEPATH); + this->GetCMakeInstance()->AddCacheEntry( + "CMAKE_MAKE_PROGRAM", make, "make program", cmStateEnums::FILEPATH); // copy the enabled languages this->GetCMakeInstance()->GetState()->SetEnabledLanguages( gen->GetCMakeInstance()->GetState()->GetEnabledLanguages()); |