mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-09 07:11:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

AutoGen: query Qt5 version from directory properties

Browse Source 
This allows functions which enable AutoGen to make the version variables
available at generate time.

See: #18732
This commit is contained in:
Ben Boeckel
2019-01-30 09:16:40 -05:00
parent b598dfb65e
commit 2df6d69014
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmQtAutoGenInitializer.cxx
View File

@@ -1281,6 +1281,12 @@ cmQtAutoGenInitializer::IntegerVersion cmQtAutoGenInitializer::GetQtVersion(
if (qtMajor.empty()) {
qtMajor = makefile->GetSafeDefinition("Qt5Core_VERSION_MAJOR");
}
if (qtMajor.empty()) {
const char* dirprop = makefile->GetProperty("Qt5Core_VERSION_MAJOR");
if (dirprop) {
qtMajor = dirprop;
}
}
{
const char* targetQtVersion =
target->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION", "");
@@ -1294,6 +1300,12 @@ cmQtAutoGenInitializer::IntegerVersion cmQtAutoGenInitializer::GetQtVersion(
if (!qtMajor.empty()) {
if (qtMajor == "5") {
qtMinor = makefile->GetSafeDefinition("Qt5Core_VERSION_MINOR");
if (qtMinor.empty()) {
const char* dirprop = makefile->GetProperty("Qt5Core_VERSION_MINOR");
if (dirprop) {
qtMinor = dirprop;
}
}
}
if (qtMinor.empty()) {
qtMinor = makefile->GetSafeDefinition("QT_VERSION_MINOR");