fix[conanv2] : add /* on conan options when generates conanfile.txt, …

…only if not exist in packagedependencies.txt
b-com-software-basis · Dec 1, 2023 · 8c38cb9 · 8c38cb9
1 parent 15ae477
commit 8c38cb9
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/packagedependencies-parser.pri b/packagedependencies-parser.pri
@@ -227,7 +227,11 @@ for(depfile, packagedepsfiles) {
                     remakenConanOptions += $${pkg.name}:shared=$${sharedLinkMode}
                 }
                 else {
-                        remakenConanOptions += $${pkg.name}/*:shared=$${sharedLinkMode}
+                        equals(pkg.name, $$replace(pkg.name, "/*","")) {
+                            remakenConanOptions += $${pkg.name}/*:shared=$${sharedLinkMode}
+                        } else {
+                            remakenConanOptions += $${pkg.name}:shared=$${sharedLinkMode}
+                        }
                     }
                 }
                 conanOptions = $$split(pkg.toolOptions, $$LITERAL_HASH)
@@ -239,7 +243,11 @@ for(depfile, packagedepsfiles) {
                             remakenConanOptions += $${pkg.name}:$$replace(conanOption, "\"","")
                         }
                         else {
-                            remakenConanOptions += $${pkg.name}/*:$$replace(conanOption, "\"","")
+                            equals(pkg.name, $$replace(pkg.name, "/*","")) {
+                                remakenConanOptions += $${pkg.name}/*:$$replace(conanOption, "\"","")
+                            } else {
+                                remakenConanOptions += $${pkg.name}:$$replace(conanOption, "\"","")
+                            }
                         }
                     }
                     else {
@@ -248,7 +256,11 @@ for(depfile, packagedepsfiles) {
                         }
                         else {
                             conanOptionPkgOption = $$member(conanOptionInfo,0)
-                            remakenConanOptions += $${conanOptionPrefix}/*:$$replace(conanOptionPkgOption, "\"","")
+                            equals(conanOptionPrefix, $$replace(conanOptionPrefix, "/*","")) {
+                               remakenConanOptions += $${conanOptionPrefix}/*:$$replace(conanOptionPkgOption, "\"","")
+                            } else {
+                               remakenConanOptions += $${conanOptionPrefix}:$$replace(conanOptionPkgOption, "\"","")
+                            }
                         }
                     }
                 }