Commit 48797098 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'cpackifw-scanbuild-fix' into release-3.20

90c2f138

 CPackIFWInstaller: Avoid potential null pointer dereference
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !5832
parents b2b73ff7 90c2f138
Pipeline #215451 canceled with stages
in 1 minute and 1 second
......@@ -186,13 +186,20 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
this->WizardShowPageList.clear();
}
} else {
std::string currentVersionMsg;
if (this->Generator) {
currentVersionMsg =
"QtIFW version " + this->Generator->FrameworkVersion;
} else {
currentVersionMsg = "an older QtIFW version";
}
cmCPackIFWLogger(
WARNING,
"Option CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST is set to \""
<< option
<< "\", but it is only supported with QtIFW version 4.0 or later. "
"It is being ignored because you are using QtIFW version "
<< this->Generator->FrameworkVersion.data() << std::endl);
"It is being ignored because you are using "
<< currentVersionMsg << std::endl);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment