summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-06-03 14:45:40 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-06-03 14:45:40 (GMT)
commit811831a958c91404193cc0a35d2d90f8351eb51c (patch)
tree589c888e14f727eb48adb6f0fa7f3f83cace3f65 /Source/cmGlobalGenerator.cxx
parent8b289db739c8d0a288e532c560b6dbcf4bd67c30 (diff)
parent7f6b8d3399dd841b0d29bf74d2b31021738c4ef8 (diff)
downloadCMake-811831a958c91404193cc0a35d2d90f8351eb51c.zip
CMake-811831a958c91404193cc0a35d2d90f8351eb51c.tar.gz
CMake-811831a958c91404193cc0a35d2d90f8351eb51c.tar.bz2
Merge topic 'simplify-boolean-expressions'
7f6b8d33 Simplify boolean expressions
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r--Source/cmGlobalGenerator.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a1764a3..fc34b8b 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -180,8 +180,7 @@ void cmGlobalGenerator::ResolveLanguageCompiler(const std::string& lang,
} else {
path = name;
}
- if ((path.empty() || !cmSystemTools::FileExists(path.c_str())) &&
- (optional == false)) {
+ if (!optional && (path.empty() || !cmSystemTools::FileExists(path))) {
return;
}
const char* cname =