Skip to content

Commit 9829e78

Browse files
authored
app lib should be taken into account for flatpak
1 parent 13b4530 commit 9829e78

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

R_HOME.pri

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@ LINUX_SPECIAL_CASE = false
33
_R_HOME = $$(R_HOME)
44

55
linux {
6-
$$LINUX_SPECIAL_CASE | exists(/app/lib/*) {
7-
_R_HOME = /usr/lib64/R
8-
INCLUDEPATH += /usr/lib64/R/library/include
6+
exists(/app/lib/*) {
7+
_R_HOME = /app/lib64/R
8+
INCLUDEPATH += /app/lib64/R/library/include
99
} else {
10-
_R_HOME = /usr/lib/R
11-
INCLUDEPATH += /usr/lib/R/library/include
12-
}
10+
$$LINUX_SPECIAL_CASE {
11+
_R_HOME = /usr/lib64/R
12+
INCLUDEPATH += /usr/lib64/R/library/include
13+
} else {
14+
_R_HOME = /usr/lib/R
15+
INCLUDEPATH += /usr/lib/R/library/include
16+
}
17+
}
1318

1419
QMAKE_CXXFLAGS += -D\'R_HOME=\"$$_R_HOME\"\'
1520
INCLUDEPATH += /usr/include/R/

0 commit comments

Comments
 (0)