Update findremakenrules.pri compliant with linux

granger35 · granger35 · commit 8bac93b3a3d8 · 2020-03-17T18:03:56.000+01:00
diff --git a/tests/SolARDescriptorExtractor/findremakenrules.pri b/tests/SolARDescriptorExtractor/findremakenrules.pri
@@ -27,8 +27,11 @@ exists(builddefs/qmake) {
     QMAKE_REMAKEN_RULES_ROOT=builddefs/qmake
 }
 else {
-    QMAKE_REMAKEN_RULES_ROOT = $$clean_path($$(REMAKEN_RULES_ROOT))/qmake
-    isEmpty(QMAKE_REMAKEN_RULES_ROOT) {
+    QMAKE_REMAKEN_RULES_ROOT = $$clean_path($$(REMAKEN_RULES_ROOT))
+    !isEmpty(QMAKE_REMAKEN_RULES_ROOT) {
+        QMAKE_REMAKEN_RULES_ROOT = $$clean_path($$(REMAKEN_RULES_ROOT)/qmake)
+    }
+    else {
         QMAKE_REMAKEN_RULES_ROOT=$${USERHOMEFOLDER}/.remaken/rules/qmake
     }
 }
@@ -37,4 +40,4 @@ else {
     error("Unable to locate remaken rules in " $${QMAKE_REMAKEN_RULES_ROOT} ". Either check your remaken installation, or provide the path to your remaken qmake root folder rules in REMAKEN_RULES_ROOT environment variable.")
 }
 
-message("Remaken qmake build rules used : " $$QMAKE_REMAKEN_RULES_ROOT)
+message("Remaken qmake build rules used : " $$QMAKE_REMAKEN_RULES_ROOT)

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,11 @@ exists(builddefs/qmake) {`
`27`	`27`	`QMAKE_REMAKEN_RULES_ROOT=builddefs/qmake`
`28`	`28`	`}`
`29`	`29`	`else {`
`30`		`- QMAKE_REMAKEN_RULES_ROOT = $$clean_path($$(REMAKEN_RULES_ROOT))/qmake`
`31`		`- isEmpty(QMAKE_REMAKEN_RULES_ROOT) {`
	`30`	`+ QMAKE_REMAKEN_RULES_ROOT = $$clean_path($$(REMAKEN_RULES_ROOT))`
	`31`	`+ !isEmpty(QMAKE_REMAKEN_RULES_ROOT) {`
	`32`	`+ QMAKE_REMAKEN_RULES_ROOT = $$clean_path($$(REMAKEN_RULES_ROOT)/qmake)`
	`33`	`+ }`
	`34`	`+ else {`
`32`	`35`	`QMAKE_REMAKEN_RULES_ROOT=$${USERHOMEFOLDER}/.remaken/rules/qmake`
`33`	`36`	`}`
`34`	`37`	`}`
`@@ -37,4 +40,4 @@ else {`
`37`	`40`	`error("Unable to locate remaken rules in " $${QMAKE_REMAKEN_RULES_ROOT} ". Either check your remaken installation, or provide the path to your remaken qmake root folder rules in REMAKEN_RULES_ROOT environment variable.")`
`38`	`41`	`}`
`39`	`42`
`40`		`-message("Remaken qmake build rules used : " $$QMAKE_REMAKEN_RULES_ROOT)`
	`43`	`+message("Remaken qmake build rules used : " $$QMAKE_REMAKEN_RULES_ROOT)`