From 2a0f955d1f12b8d2b93a48d33e7fe4cb504cc8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E5=8D=9A=E6=96=87?= Date: Mon, 5 Mar 2018 21:43:32 +0800 Subject: [PATCH] install dbus files Change-Id: Ib24ac2df5b95158e2b9208480b8d6b741dd3ede9 --- CMakeLists.txt | 8 +++++++- frame/CMakeLists.txt | 3 --- interfaces/interfaces.pri | 15 --------------- 3 files changed, 7 insertions(+), 19 deletions(-) delete mode 100644 interfaces/interfaces.pri diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e1665b5a..38abe0b93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.7) set(VERSION 4.0) +project(dde-dock) + #set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_CXX_STANDARD 14) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -27,7 +29,7 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX /usr) endif () -# qm files +## qm files file(GLOB QM_FILES "translations/*.qm") install(FILES ${QM_FILES} DESTINATION share/dde-dock/translations) @@ -35,3 +37,7 @@ install(FILES ${QM_FILES} ## dev files install (FILES ${INTERFACES} DESTINATION include/dde-dock) + +## services files +install(FILES frame/com.deepin.dde.Dock.service + DESTINATION /usr/share/dbus-1/services) diff --git a/frame/CMakeLists.txt b/frame/CMakeLists.txt index 75fb997f3..8838685eb 100644 --- a/frame/CMakeLists.txt +++ b/frame/CMakeLists.txt @@ -1,8 +1,5 @@ cmake_minimum_required(VERSION 3.7) -project(dde-dock - VERSION ${VERSION}) - set(BIN_NAME dde-dock) configure_file(environments.h.in environments.h @ONLY) diff --git a/interfaces/interfaces.pri b/interfaces/interfaces.pri deleted file mode 100644 index 0fb8c8916..000000000 --- a/interfaces/interfaces.pri +++ /dev/null @@ -1,15 +0,0 @@ -DEFINES += QT_MESSAGELOGCONTEXT - -HEADERS += \ - $$PWD/pluginsiteminterface.h \ - $$PWD/constants.h \ - $$PWD/pluginproxyinterface.h - -SOURCES += \ - -INCLUDEPATH += $$PWD - -isEmpty(PREFIX) -{ - PREFIX = /usr -}