Selaa lähdekoodia

AutoGen: query Qt5 version from directory properties

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

See: #18732
Ben Boeckel 6 vuotta sitten
vanhempi
sitoutus
2df6d69014
1 muutettua tiedostoa jossa 12 lisäystä ja 0 poistoa
  1. 12 0
      Source/cmQtAutoGenInitializer.cxx

+ 12 - 0
Source/cmQtAutoGenInitializer.cxx

@@ -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");