Adding upstream version 0.11.1.
Signed-off-by: Alf Gaida <agaida@siduction.org>
This commit is contained in:
parent
68e7af3f55
commit
fbea392df8
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +0,0 @@
|
||||
build
|
||||
translations/lxqt-policykit
|
@ -1,7 +1,14 @@
|
||||
|
||||
lxqt-policykit-0.11.0 / 2016-09-24
|
||||
lxqt-policykit-0.11.1 / 2017-01-01
|
||||
==================================
|
||||
|
||||
* Make CMakeLists.txt more uniform.
|
||||
* Remove cpack (#25)
|
||||
|
||||
0.11.0 / 2016-09-24
|
||||
===================
|
||||
|
||||
* Release 0.11.0: Add changelog
|
||||
* agentGui: Use default icon
|
||||
* agentGui: Choose current user in identities combo
|
||||
* agentGui: Handle setting the prompt correctly
|
||||
|
@ -1,28 +1,30 @@
|
||||
cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
|
||||
|
||||
project(lxqt-policykit-agent)
|
||||
|
||||
option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
|
||||
|
||||
include(GNUInstallDirs)
|
||||
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
|
||||
|
||||
find_package(PkgConfig)
|
||||
pkg_check_modules(POLKIT_AGENT REQUIRED polkit-agent-1)
|
||||
message(STATUS "polkit agent: ${POLKIT_AGENT_INCLUDE_DIRS} ${POLKIT_AGENT_LIBRARIES}")
|
||||
|
||||
set(POLKIT_AGENT_BINARY_DIR "${CMAKE_INSTALL_BINDIR}" CACHE FILEPATH "Directory for install polkit agent")
|
||||
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
|
||||
find_package(PolkitQt5-1 REQUIRED)
|
||||
find_package(Qt5Widgets REQUIRED QUIET)
|
||||
find_package(Qt5LinguistTools REQUIRED QUIET)
|
||||
find_package(lxqt REQUIRED QUIET)
|
||||
find_package(Qt5Widgets REQUIRED)
|
||||
message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}")
|
||||
|
||||
find_package(lxqt REQUIRED)
|
||||
|
||||
include(LXQtCompilerSettings NO_POLICY_SCOPE)
|
||||
include(LXQtTranslate)
|
||||
|
||||
# Deal with a bug in polkit-qt5
|
||||
if (NOT IS_ABSOLUTE "${POLKITQT-1_INCLUDE_DIR}")
|
||||
@ -58,7 +60,9 @@ set(lxqt-policykit-agent_UI
|
||||
src/policykitagentgui.ui
|
||||
)
|
||||
|
||||
# Translations
|
||||
# Translations **********************************
|
||||
include(LXQtTranslate)
|
||||
|
||||
lxqt_translate_ts(lxqt-policykit-agent_QM_FILES
|
||||
UPDATE_TRANSLATIONS
|
||||
${UPDATE_TRANSLATIONS}
|
||||
@ -81,6 +85,7 @@ lxqt_translate_ts(lxqt-policykit-agent_QM_FILES
|
||||
)
|
||||
|
||||
lxqt_app_translation_loader(QM_LOADER ${PROJECT_NAME})
|
||||
#************************************************
|
||||
|
||||
add_executable(lxqt-policykit-agent
|
||||
${lxqt-policykit-agent_SRCS}
|
||||
@ -103,13 +108,3 @@ install(TARGETS
|
||||
DESTINATION "${POLKIT_AGENT_BINARY_DIR}"
|
||||
COMPONENT Runtime
|
||||
)
|
||||
|
||||
# building tarball with CPack -------------------------------------------------
|
||||
include(InstallRequiredSystemLibraries)
|
||||
set(CPACK_PACKAGE_VERSION_MAJOR ${LXQT_MAJOR_VERSION})
|
||||
set(CPACK_PACKAGE_VERSION_MINOR ${LXQT_MINOR_VERSION})
|
||||
set(CPACK_PACKAGE_VERSION_PATCH ${LXQT_PATCH_VERSION})
|
||||
set(CPACK_GENERATOR TBZ2)
|
||||
set(CPACK_SOURCE_GENERATOR TBZ2)
|
||||
set(CPACK_SOURCE_IGNORE_FILES /build/;.gitignore;.*~;.git;.kdev4;temp)
|
||||
include(CPack)
|
||||
|
Loading…
x
Reference in New Issue
Block a user