From 8d6c8e3ad4eb14158a5e787f8d21d7a7cf80e447 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 13 May 2020 08:20:09 +0200 Subject: [PATCH] Try to fight problems in copying headers on macos. --- pri/install.pri | 9 +++++---- resources/desktop/com.github.rssguard.appdata.xml | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pri/install.pri b/pri/install.pri index 24de8b14e..1948f8d36 100644 --- a/pri/install.pri +++ b/pri/install.pri @@ -177,7 +177,7 @@ win32 { INSTALLS += target lib - INSTALL_HEADERS_PREFIX = $$quote($$PREFIX/include/librssguard/) + INSTALL_HEADERS_PREFIX = $$quote($$PREFIX/include/librssguard) } # Install all files on Linux. @@ -199,7 +199,7 @@ unix:!mac:!android { INSTALLS += target lib desktop_file desktop_icon appdata - INSTALL_HEADERS_PREFIX = $$quote($$PREFIX/include/librssguard/) + INSTALL_HEADERS_PREFIX = $$quote($$PREFIX/include/librssguard) } mac { @@ -234,7 +234,7 @@ mac { 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\".) @@ -242,10 +242,11 @@ message($$MSG_PREFIX: Prefix for headers is \"$$INSTALL_HEADERS_PREFIX\".) # Create install step for each folder of public headers. for(header, INSTALL_HEADERS) { path = $${INSTALL_HEADERS_PREFIX}/$${dirname(header)} + path = $$shell_quote($$path) message($$MSG_PREFIX: Adding header \"$$header\" to \"make install\" step with path \"$$path\".) eval(headers_$${dirname(header)}.files += $$header) - eval(headers_$${dirname(header)}.path = $$quote($$path)) + eval(headers_$${dirname(header)}.path = $$path) eval(INSTALLS *= headers_$${dirname(header)}) } diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index face796b1..580f52887 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -30,7 +30,7 @@ https://martinrotter.github.io/donate/ - + none