pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try to fight problems in copying headers on macos.

Browse source
This commit is contained in:
Martin Rotter 2020-05-13 08:20:09 +02:00
parent f8f02885f8
commit 8d6c8e3ad4
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pri/install.pri
View file

@ -177,7 +177,7 @@ win32 {
INSTALLS += target lib INSTALLS += target lib
INSTALL_HEADERS_PREFIX = $$quote($$PREFIX/include/librssguard/) INSTALL_HEADERS_PREFIX = $$quote($$PREFIX/include/librssguard)
} }
# Install all files on Linux. # Install all files on Linux.
@ -199,7 +199,7 @@ unix:!mac:!android {
INSTALLS += target lib desktop_file desktop_icon appdata INSTALLS += target lib desktop_file desktop_icon appdata
INSTALL_HEADERS_PREFIX = $$quote($$PREFIX/include/librssguard/) INSTALL_HEADERS_PREFIX = $$quote($$PREFIX/include/librssguard)
} }
mac { mac {
@ -234,7 +234,7 @@ mac {
INSTALLS += target lib icns_icon info_plist info_plist2 pkginfo INSTALLS += target lib icns_icon info_plist info_plist2 pkginfo
INSTALL_HEADERS_PREFIX = $$quote($$PREFIX/Contents/Resources/Include/librssguard) INSTALL_HEADERS_PREFIX = $$shell_quote($$PREFIX/Contents/Resources/Include/librssguard)
} }
message($$MSG_PREFIX: Prefix for headers is \"$$INSTALL_HEADERS_PREFIX\".) message($$MSG_PREFIX: Prefix for headers is \"$$INSTALL_HEADERS_PREFIX\".)
@ -242,10 +242,11 @@ message($$MSG_PREFIX: Prefix for headers is \"$$INSTALL_HEADERS_PREFIX\".)
# Create install step for each folder of public headers. # Create install step for each folder of public headers.
for(header, INSTALL_HEADERS) { for(header, INSTALL_HEADERS) {
path = $${INSTALL_HEADERS_PREFIX}/$${dirname(header)} path = $${INSTALL_HEADERS_PREFIX}/$${dirname(header)}
path = $$shell_quote($$path)
message($$MSG_PREFIX: Adding header \"$$header\" to \"make install\" step with path \"$$path\".) message($$MSG_PREFIX: Adding header \"$$header\" to \"make install\" step with path \"$$path\".)
eval(headers_$${dirname(header)}.files += $$header) eval(headers_$${dirname(header)}.files += $$header)
eval(headers_$${dirname(header)}.path = $$quote($$path)) eval(headers_$${dirname(header)}.path = $$path)
eval(INSTALLS *= headers_$${dirname(header)}) eval(INSTALLS *= headers_$${dirname(header)})
} }

2
resources/desktop/com.github.rssguard.appdata.xml
View file

@ -30,7 +30,7 @@
<url type="donation">https://martinrotter.github.io/donate/</url> <url type="donation">https://martinrotter.github.io/donate/</url>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="3.6.1" date="2020-05-12"/> <release version="3.6.1" date="2020-05-13"/>
</releases> </releases>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute> <content_attribute id="violence-cartoon">none</content_attribute>