[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-browser-integration/Plasma/5.13] /: Respect libdir for Firefox native messaging host manifes
From:       Andreas Sturmlechner <null () kde ! org>
Date:       2018-05-29 7:58:21
Message-ID: E1fNZWP-0006Kf-7t () code ! kde ! org
[Download RAW message or body]

Git commit 9a4e032c04fd567a3b3a5d2e050a22abd689d575 by Andreas Sturmlechner=
, on behalf of Arfrever Frehtes Taifersar Arahesis.
Committed on 29/05/2018 at 07:58.
Pushed by asturmlechner into branch 'Plasma/5.13'.

Respect libdir for Firefox native messaging host manifest

Reviewers: #plasma, bshah

Reviewed By: #plasma, bshah

Subscribers: jgrulich, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D13188

M  +4    -1    CMakeLists.txt

https://commits.kde.org/plasma-browser-integration/9a4e032c04fd567a3b3a5d2e=
050a22abd689d575

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a14b60..184b288 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,9 @@ add_feature_info(CHROMIUM_EXTENSIONS_DIR On "Directory na=
me to install Chromium
 option(COPY_MESSAGING_HOST_FILE_HOME "Copy the native messaging hosts json=
 file to user home dir" FALSE)
 add_feature_info(COPY_MESSAGING_HOST_FILE_HOME ${COPY_MESSAGING_HOST_FILE_=
HOME} "Enable this option to copy the native messaging hosts json file to h=
ome dir if you install plasma-browser-integration to custom prefix (non-/us=
r)")
 =

+set(MOZILLA_DIR "${CMAKE_INSTALL_PREFIX}/lib/mozilla" CACHE STRING "Mozill=
a directory")
+add_feature_info(MOZILLA_DIR On "Mozilla directory is '${MOZILLA_DIR}'")
+
 add_subdirectory(host)
 add_subdirectory(tabsrunner)
 add_subdirectory(reminder)
@@ -66,7 +69,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasma.=
chrome_integration.json
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasma.chrome_integratio=
n.json DESTINATION ${KDE_INSTALL_FULL_SYSCONFDIR}/opt/chrome/native-messagi=
ng-hosts/ RENAME org.kde.plasma.browser_integration.json)
 # firefox
 =

-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasma.firefox_integrati=
on.json DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/mozilla/native-messaging-ho=
sts/ RENAME org.kde.plasma.browser_integration.json)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasma.firefox_integrati=
on.json DESTINATION ${MOZILLA_DIR}/native-messaging-hosts/ RENAME org.kde.p=
lasma.browser_integration.json)
 =

 if (COPY_MESSAGING_HOST_FILE_HOME)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasma.firefox_integ=
ration.json DESTINATION $ENV{HOME}/.mozilla/native-messaging-hosts/ RENAME =
org.kde.plasma.browser_integration.json)
[prev in list] [next in list] [prev in thread] [next in thread]