[chrome-gnome-shell] ubuntu: added option to use '--install-layout=deb' distutils parameter
- From: Yuri Konotopov <ykonotopov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chrome-gnome-shell] ubuntu: added option to use '--install-layout=deb' distutils parameter
- Date: Mon, 5 Sep 2016 20:07:39 +0000 (UTC)
commit 7e1cbf3a1a1ca900bee5485a75ccb257d791205f
Author: Yuri Konotopov <ykonotopov gmail com>
Date: Mon Sep 5 23:06:19 2016 +0300
ubuntu: added option to use '--install-layout=deb' distutils parameter
CMakeLists.txt | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25e58a8..ca7fe17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,7 @@ option(BUILD_CONNECTOR "Build native messaging host" TRUE)
option(BUILD_SOURCE_PACKAGE "Build source package" FALSE)
option(BUILD_DEB "Build debian package" FALSE)
option(BUILD_MESSAGES "Update translation strings" FALSE)
+option(USE_DEBIAN_LAYOUT "Use --install-layout=deb distutils parameter" FALSE)
# Default extension key for Chrome web store
if(NOT DEFINED(CHROME_EXTENSION_KEY))
@@ -145,6 +146,12 @@ if(BUILD_CONNECTOR)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/policies/chrome-gnome-shell.json"
"${CMAKE_BINARY_DIR}/")
+ if(DEFINED(USE_DEBIAN_LAYOUT))
+ set(DISTUTILS_EXTRA_ARGS "--install-layout=deb")
+ else()
+ set(DISTUTILS_EXTRA_ARGS "")
+ endif(DEFINED(USE_DEBIAN_LAYOUT))
+
install(CODE "
if(DEFINED ENV{DESTDIR})
set(DESTDIR \"\$ENV{DESTDIR}\")
@@ -153,7 +160,7 @@ if(BUILD_CONNECTOR)
endif(DEFINED ENV{DESTDIR})
execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CONNECTOR_SETUP}
- install
+ install ${DISTUTILS_EXTRA_ARGS}
--root \"\${DESTDIR}\"
--prefix \"${CMAKE_INSTALL_PREFIX}\")")
install(FILES "${CMAKE_BINARY_DIR}/io.github.ne0sight.gs_chrome_connector.json" DESTINATION
"/etc/chromium/native-messaging-hosts/")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]