summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-01-17 14:38:53 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-01-17 14:39:32 (GMT)
commit796d66438bce2a46235642767d0614c158723738 (patch)
tree4535cd9951924fed203c3f2f9f5e88bd74fbb052 /Source
parent85e959b7273f3d31643dafb2208afdd4a45a3eaf (diff)
parent310b58e96155edd0d7d39285639ae903a49df3dc (diff)
downloadCMake-796d66438bce2a46235642767d0614c158723738.zip
CMake-796d66438bce2a46235642767d0614c158723738.tar.gz
CMake-796d66438bce2a46235642767d0614c158723738.tar.bz2
Merge topic 'rename-cross-config-variable'
310b58e961 Ninja Multi-Config: Rename variable to be more consistent Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4234
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGlobalNinjaGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 0048ba4..0487ad1 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -2203,7 +2203,7 @@ bool cmGlobalNinjaGenerator::WriteDyndepFile(
bool cmGlobalNinjaGenerator::EnableCrossConfigBuild() const
{
return this->IsMultiConfig() &&
- this->Makefiles.front()->IsOn("CMAKE_NINJA_CROSS_CONFIG_ENABLE");
+ this->Makefiles.front()->IsOn("CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE");
}
int cmcmd_cmake_ninja_dyndep(std::vector<std::string>::const_iterator argBeg,