From dd5889998f4c4cf5d8d34c3709f961a59ee57fe5 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 11 Dec 2016 20:18:46 +0100 Subject: [PATCH] Adding upstream version 0.3.3. Signed-off-by: Alf Gaida --- CHANGELOG | 16 +- CMakeLists.txt | 51 +++--- README.md | 2 +- cmake/LXQtCompilerSettings.cmake | 141 ---------------- cmake/create_pkgconfig_file.cmake | 245 ---------------------------- cmake/create_portable_headers.cmake | 30 ---- cmake/sysstat-config.cmake.in | 3 +- release.sh | 28 ---- 8 files changed, 39 insertions(+), 477 deletions(-) delete mode 100644 cmake/LXQtCompilerSettings.cmake delete mode 100644 cmake/create_pkgconfig_file.cmake delete mode 100644 cmake/create_portable_headers.cmake delete mode 100755 release.sh diff --git a/CHANGELOG b/CHANGELOG index b9091c4..3f920a4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,21 @@ -libsysstat-0.3.2 / 2016-09-17 +libsysstat-0.3.3 / 2016-12-11 ============================= + * Bump patch version to 3 + * Simplify include_directories and compile definitions + * Adds Building project name and Qt version message + * Adds a minimum Qt minimum version requirement + * README.md: Add build dependency lxqt-build-tools + * Use the lxqt-build-tools LXQtCreatePkgConfigFile + * Use the lxqt-build-tools LXQtCreatePortableHeaders module + * Use the new lxqt-build-tools package + * Remove cpack (#14) + +0.3.2 / 2016-09-17 +================== + + * Release 0.3.2: Add changelog * Bump version to 0.3.2 * Add README.md * fixes lxde/libsysstat/issues/11 diff --git a/CMakeLists.txt b/CMakeLists.txt index e418e72..d90c9e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,19 +4,25 @@ project(libsysstat) set(MAJOR_VERSION 0) set(MINOR_VERSION 3) -set(PATCH_VERSION 2) +set(PATCH_VERSION 3) set(SYSSTAT_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}") +set(LXQTBT_MINIMUM_VERSION "0.1.0") +set(QT_MINIMUM_VERSION "5.4.2") + # additional cmake files list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED) +find_package(Qt5Core ${QT_MINIMUM_VERSION} REQUIRED) +message(STATUS "Building ${PROJECT_NAME} with Qt ${Qt5Core_VERSION_STRING}") + include(CMakePackageConfigHelpers) include(GNUInstallDirs) # Standard directories for installation -include(create_pkgconfig_file) +include(LXQtCreatePkgConfigFile) +include(LXQtCreatePortableHeaders) include(LXQtCompilerSettings NO_POLICY_SCOPE) -find_package(Qt5Core REQUIRED QUIET) - set(CMAKE_AUTOMOC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -82,25 +88,22 @@ set_target_properties(${SYSSTAT_LIBRARY_NAME} PROPERTIES ) target_compile_definitions(${SYSSTAT_LIBRARY_NAME} - PRIVATE "MAJOR_VERSION=${MAJOR_VERSION}" - PRIVATE "MINOR_VERSION=${MINOR_VERSION}" - PRIVATE "PATCH_VERSION=${PATCH_VERSION}" - PRIVATE "SYSSTAT_LIBRARY" + PRIVATE + "MAJOR_VERSION=${MAJOR_VERSION}" + "MINOR_VERSION=${MINOR_VERSION}" + "PATCH_VERSION=${PATCH_VERSION}" + "SYSSTAT_LIBRARY" ) target_include_directories(${SYSSTAT_LIBRARY_NAME} - INTERFACE "$" + INTERFACE + "$" + "$" ) -target_include_directories(${SYSSTAT_LIBRARY_NAME} - INTERFACE "$" -) - -include(cmake/create_portable_headers.cmake) - -create_portable_headers(SYSSTAT_NAMESPACE_HEADERS - NAMESPACE "${HEADER_NAMESPACE}/" - FILENAMES ${SYSSTAT_PUBLIC_CLASSES} +lxqt_create_portable_headers(SYSSTAT_NAMESPACE_HEADERS + PATH_PREFIX ".." + HEADER_NAMES ${SYSSTAT_PUBLIC_CLASSES} ) foreach(h ${SYSSTAT_NAMESPACE_HEADERS}) @@ -138,7 +141,7 @@ export(TARGETS FILE "${CMAKE_BINARY_DIR}/${SYSSTAT_LIBRARY_NAME}-targets.cmake" ) -create_pkgconfig_file( +lxqt_create_pkgconfig_file( PACKAGE_NAME ${SYSSTAT_LIBRARY_NAME} DESCRIPTIVE_NAME ${SYSSTAT_LIBRARY_NAME} DESCRIPTION "SysStat, a Qt-based interface to system statistics" @@ -177,13 +180,3 @@ install(EXPORT DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/${SYSSTAT_LIBRARY_NAME}" COMPONENT Devel ) - -# building tarball with CPack ------------------------------------------------- -include(InstallRequiredSystemLibraries) -set(CPACK_PACKAGE_VERSION_MAJOR ${MAJOR_VERSION}) -set(CPACK_PACKAGE_VERSION_MINOR ${MINOR_VERSION}) -set(CPACK_PACKAGE_VERSION_PATCH ${PATCH_VERSION}) -set(CPACK_GENERATOR TBZ2) -set(CPACK_SOURCE_GENERATOR TBZ2) -set(CPACK_SOURCE_IGNORE_FILES /build/;.gitignore;.*~;.git;.kdev4;temp) -include(CPack) diff --git a/README.md b/README.md index e0ce081..c779306 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Note replacing both libsysstat and libstatgrab in LXQt by KDE Frameworks compone ### Sources -The only runtime dependency is qtbase. To build CMake is needed in addition, as well as optionally Git to pull latest VCS checkouts. +The only runtime dependency is qtbase. To build CMake and [lxqt-build-tools](https://github.com/lxde/lxqt-build-tools) are needed in addition, as well as optionally Git to pull latest VCS checkouts. Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` will normally have to be set to `/usr`, depending on the way library paths are dealt with on 64bit systems variables like `CMAKE_INSTALL_LIBDIR` may have to be set as well. diff --git a/cmake/LXQtCompilerSettings.cmake b/cmake/LXQtCompilerSettings.cmake deleted file mode 100644 index 56d39c1..0000000 --- a/cmake/LXQtCompilerSettings.cmake +++ /dev/null @@ -1,141 +0,0 @@ -#============================================================================= -# Copyright 2015 Luís Pereira -# Copyright 2015 Palo Kisa -# Copyright 2013 Hong Jen Yee (PCMan) -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#============================================================================= - -#----------------------------------------------------------------------------- -# Honor visibility properties for all target types. -# -# The ``_VISIBILITY_PRESET`` and -# ``VISIBILITY_INLINES_HIDDEN`` target properties affect visibility -# of symbols during dynamic linking. When first introduced these properties -# affected compilation of sources only in shared libraries, module libraries, -# and executables with the ``ENABLE_EXPORTS`` property set. This -# was sufficient for the basic use cases of shared libraries and executables -# with plugins. However, some sources may be compiled as part of static -# libraries or object libraries and then linked into a shared library later. -# CMake 3.3 and above prefer to honor these properties for sources compiled -# in all target types. This policy preserves compatibility for projects -# expecting the properties to work only for some target types. -# -# The ``OLD`` behavior for this policy is to ignore the visibility properties -# for static libraries, object libraries, and executables without exports. -# The ``NEW`` behavior for this policy is to honor the visibility properties -# for all target types. -# -# This policy was introduced in CMake version 3.3. CMake version -# 3.3.0 warns when the policy is not set and uses ``OLD`` behavior. Use -# the ``cmake_policy()`` command to set it to ``OLD`` or ``NEW`` -# explicitly. -#----------------------------------------------------------------------------- -if(COMMAND CMAKE_POLICY) - if (POLICY CMP0063) - cmake_policy(SET CMP0063 NEW) - endif() -endif() - -#include(CheckCXXCompilerFlag) - -#----------------------------------------------------------------------------- -# Detect Clang compiler -#----------------------------------------------------------------------------- -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(LXQT_COMPILER_IS_CLANGCXX 1) -endif() - - -#----------------------------------------------------------------------------- -# Set visibility to hidden to hide symbols, unless they're exported manually -# in the code -#----------------------------------------------------------------------------- -set(CMAKE_CXX_VISIBILITY_PRESET hidden) -set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) - - -#----------------------------------------------------------------------------- -# Disable exceptions -#----------------------------------------------------------------------------- -if (CMAKE_COMPILER_IS_GNUCXX OR LXQT_COMPILER_IS_CLANGCXX) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") -endif() - - -#----------------------------------------------------------------------------- -# Common warning flags -#----------------------------------------------------------------------------- -set(__LXQT_COMMON_WARNING_FLAGS "-Wall") - - -#----------------------------------------------------------------------------- -# Warning flags -#----------------------------------------------------------------------------- -if (CMAKE_COMPILER_IS_GNUCXX OR LXQT_COMPILER_IS_CLANGCXX) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${__LXQT_COMMON_WARNING_FLAGS}") -endif() - - -#----------------------------------------------------------------------------- -# Linker flags -# Do not allow undefined symbols -#----------------------------------------------------------------------------- -if (CMAKE_COMPILER_IS_GNUCXX OR LXQT_COMPILER_IS_CLANGCXX) - set(CMAKE_SHARED_LINKER_FLAGS - "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}" - ) - set(CMAKE_MODULE_LINKER_FLAGS - "-Wl,--no-undefined ${CMAKE_MODULE_LINKER_FLAGS}" - ) -endif() - - -#----------------------------------------------------------------------------- -# CXX11 and CXX0X requirements -#----------------------------------------------------------------------------- -#CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) -#CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) -#if(COMPILER_SUPPORTS_CXX11) -# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -#elseif(COMPILER_SUPPORTS_CXX0X) -# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -#else() -# message(FATAL "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. C++11 support is required") -#endif() - - -#----------------------------------------------------------------------------- -# Enable exceptions for an target -# -# lxqt_enable_target_exceptions( -# -# ) -# -#----------------------------------------------------------------------------- -function(lxqt_enable_target_exceptions target mode) - target_compile_options(${target} ${mode} - "$<$,$>:-fexceptions>" - ) -endfunction() diff --git a/cmake/create_pkgconfig_file.cmake b/cmake/create_pkgconfig_file.cmake deleted file mode 100644 index b218cef..0000000 --- a/cmake/create_pkgconfig_file.cmake +++ /dev/null @@ -1,245 +0,0 @@ -#============================================================================= -# Copyright 2015 Luís Pereira -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#=============================================================================# - -# create_pkgconfig_file(PACKAGE_NAME -# VERSION -# [PREFIX ] -# [EXEC_PREFIX ] -# [INCLUDEDIR_PREFIX ] -# [INCLUDEDIRS ... ] -# [LIBDIR_PREFIX ] -# [DESCRIPTIVE_NAME ] -# [DESCRIPTION ] -# [URL ] -# [REQUIRES ... ] -# [REQUIRES_PRIVATE ... ] -# [LIB_INSTALLDIR ] -# [CFLAGS ] -# [PATH ] -# [INSTALL]) -# -# -# PACKAGE_NAME and VERSION are mandatory. Everything else is optional - -include(CMakeParseArguments) -include(GNUInstallDirs) - -function(create_pkgconfig_file) - set(options INSTALL) - set(oneValueArgs - PACKAGE_NAME - PREFIX - EXEC_PREFIX - INCLUDEDIR_PREFIX - LIBDIR_PREFIX - DESCRIPTIVE_NAME - DESCRIPTION - URL - VERSION - PATH - ) - set(multiValueArgs - INCLUDEDIRS - REQUIRES - REQUIRES_PRIVATE - CONFLICTS - CFLAGS - LIBS - LIBS_PRIVATE - ) - - cmake_parse_arguments(USER "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - - if (USER_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "Unknown keywords given to create_pkgconfig_file(): \"${USER_UNPARSED_ARGUMENTS}\"") - endif() - - # Check for mandatory args. Abort if not set - if (NOT DEFINED USER_PACKAGE_NAME) - message(FATAL_ERROR "Required argument PACKAGE_NAME missing in generate_pkgconfig_file() call") - else() - set(_PKGCONFIG_PACKAGE_NAME "${USER_PACKAGE_NAME}") - endif() - - if (NOT DEFINED USER_VERSION) - message(FATAL_ERROR "Required argument VERSION missing in generate_pkgconfig_file() call") - else() - set(_PKGCONFIG_VERSION "${USER_VERSION}") - endif() - - - # Optional args - if (NOT DEFINED USER_PREFIX) - set(_PKGCONFIG_PREFIX "${CMAKE_INSTALL_PREFIX}") - endif() - - if (NOT DEFINED USER_EXEC_PREFIX) - set(_PKGCONFIG_EXEC_PREFIX "\${prefix}") - endif() - - if (NOT DEFINED USER_INCLUDEDIR_PREFIX) - set(_PKGCONFIG_INCLUDEDIR_PREFIX "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") - endif() - - if (NOT DEFINED USER_LIBDIR_PREFIX) - set(_PKGCONFIG_LIBDIR_PREFIX "\${prefix}/${CMAKE_INSTALL_LIBDIR}") - endif() - - if (NOT DEFINED USER_DESCRIPTIVE_NAME) - set(_PKGCONFIG_DESCRIPTIVE_NAME "") - else() - set(_PKGCONFIG_DESCRIPTIVE_NAME "${USER_DESCRIPTIVE_NAME}") - endif() - - if (DEFINED USER_INCLUDEDIRS) - set(tmp "") - foreach(dir ${USER_INCLUDEDIRS}) - if (NOT IS_ABSOLUTE "${dir}") - list(APPEND tmp "-I\${includedir}/${dir}") - endif() - endforeach() - string(REPLACE ";" " " _INCLUDEDIRS "${tmp}") - endif() - - if (DEFINED USER_REQUIRES) - string(REPLACE ";" ", " _PKGCONFIG_REQUIRES "${USER_REQUIRES}") - endif() - - if (DEFINED USER_REQUIRES_PRIVATE) - string(REPLACE ";" ", " _PKGCONFIG_REQUIRES_PRIVATE "${USER_REQUIRES_PRIVATE}") - else() - set(_PKGCONFIG_REQUIRES_PRIVATE "") - endif() - - if (NOT DEFINED USER_CFLAGS) - set(_PKGCONFIG_CFLAGS "-I\${includedir} ${_INCLUDEDIRS}") - endif() - - if (NOT DEFINED USER_LIBS) - set(_PKGCONFIG_LIBS "-L\${libdir}") - else() - set(tmp "-L\${libdir}") - set(_libs "${USER_LIBS}") - foreach(lib ${_libs}) - list(APPEND tmp "-l${lib}") - endforeach() - string(REPLACE ";" " " _PKGCONFIG_LIBS "${tmp}") - endif() - - if (NOT DEFINED USER_LIBS_PRIVATE) - set(PKGCONFIG_LIBS "-L\${libdir}") - else() - set(tmp "") - set(_libs "${USER_LIBS_PRIVATE}") - foreach(lib ${_libs}) - list(APPEND tmp "-l${lib}") - endforeach() - string(REPLACE ";" " " _PKGCONFIG_LIBS_PRIVATE "${tmp}") - endif() - - if (DEFINED USER_DESCRIPTION) - set(_PKGCONFIG_DESCRIPTION "${USER_DESCRIPTION}") - else() - set(_PKGCONFIG_DESCRIPTION "") - endif() - - if (DEFINED USER_URL) - set(_PKFCONFIG_URL "${USER_URL}") - else() - set(_PKGCONFIG_URL "") - endif() - - if (NOT DEFINED USER_PATH) - set(_PKGCONFIG_FILE "${PROJECT_BINARY_DIR}/${_PKGCONFIG_PACKAGE_NAME}.pc") - else() - if (IS_ABSOLUTE "${USER_PATH}") - set(_PKGCONFIG_FILE "${USER_PATH}/${_PKGCONFIG_PACKAGE_NAME}.pc") - else() - set(_PKGCONFIG_FILE "${PROJECT_BINARY_DIR}/${USER_PATH}/${_PKGCONFIG_PACKAGE_NAME}.pc") - endif() - endif() - - # Write the .pc file - FILE(WRITE "${_PKGCONFIG_FILE}" - "# file generated by create_pkgconfig_file()\n" - "prefix=${_PKGCONFIG_PREFIX}\n" - "exec_prefix=${_PKGCONFIG_EXEC_PREFIX}\n" - "libdir=${_PKGCONFIG_LIBDIR_PREFIX}\n" - "includedir=${_PKGCONFIG_INCLUDEDIR_PREFIX}\n" - "\n" - "Name: ${_PKGCONFIG_DESCRIPTIVE_NAME}\n" - ) - - if (NOT "${_PKGCONFIG_DESCRIPTION}" STREQUAL "") - FILE(APPEND ${_PKGCONFIG_FILE} - "Description: ${_PKGCONFIG_DESCRIPTION}\n" - ) - endif() - - if (NOT "${_PKGCONFIG_URL}" STREQUAL "") - FILE(APPEND ${_PKGCONFIG_FILE} "URL: ${_PKGCONFIG_URL}\n") - endif() - - FILE(APPEND ${_PKGCONFIG_FILE} "Version: ${_PKGCONFIG_VERSION}\n") - - if (NOT "${_PKGCONFIG_REQUIRES}" STREQUAL "") - FILE(APPEND ${_PKGCONFIG_FILE} "Requires: ${_PKGCONFIG_REQUIRES}\n") - endif() - - if (NOT "${_PKGCONFIG_REQUIRES_PRIVATE}" STREQUAL "") - FILE(APPEND ${_PKGCONFIG_FILE} - "Requires.private: ${_PKGCONFIG_REQUIRES_PRIVATE}\n" - ) - endif() - - - FILE(APPEND ${_PKGCONFIG_FILE} - "Cflags: ${_PKGCONFIG_CFLAGS}\n" - "Libs: ${_PKGCONFIG_LIBS}\n" - ) - - if (NOT "${_PKGCONFIG_LIBS_PRIVATE}" STREQUAL "") - FILE(APPEND ${_PKGCONFIG_FILE} - "Libs.private: ${_PKGCONFIG_REQUIRES_PRIVATE}\n" - ) - endif() - - if (DEFINED USER_INSTALL) - # FreeBSD loves to install files to different locations - # http://www.freebsd.org/doc/handbook/dirstructure.html - if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") - set(_PKGCONFIG_INSTALL_DESTINATION "libdata/pkgconfig") - else() - set(_PKGCONFIG_INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") - endif() - - # Make the COMPONENT an parameter ? - install(FILES "${_PKGCONFIG_FILE}" - DESTINATION "${_PKGCONFIG_INSTALL_DESTINATION}" - COMPONENT Devel) - endif() -endfunction() diff --git a/cmake/create_portable_headers.cmake b/cmake/create_portable_headers.cmake deleted file mode 100644 index 13a67a2..0000000 --- a/cmake/create_portable_headers.cmake +++ /dev/null @@ -1,30 +0,0 @@ -# Creates portable headers; e.g.: -# Creates XdgAction from xdgaction.h -# XdgAction contents: -# #include "xdgaction.h" -# -# Use: -# set(PUBLIC_CLASSES MyClass YourClass) -# create_portable_headers(PORTABLE_HEADERS ${PUBLIC_CLASSES}) -# PORTABLE_HEADER is an return value that contains the full name of the -# generated headers. - -function(create_portable_headers outfiles) - set(options) - set(oneValueArgs NAMESPACE) - set(multiValueArgs FILENAMES) - - cmake_parse_arguments(_CREATE_PORTABLE_HEADERS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - set(prefix ${_CREATE_PORTABLE_HEADERS_NAMESPACE}) - set(class_list ${_CREATE_PORTABLE_HEADERS_FILENAMES}) - foreach(f ${class_list}) - string(TOLOWER "${f}.h" _filename) - - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${f} - "#include \"../${_filename}\"") - - list(APPEND ${outfiles} ${CMAKE_CURRENT_BINARY_DIR}/${f}) - endforeach() - - set(${outfiles} ${${outfiles}} PARENT_SCOPE) -endfunction() diff --git a/cmake/sysstat-config.cmake.in b/cmake/sysstat-config.cmake.in index 4c34d2d..d8218c6 100644 --- a/cmake/sysstat-config.cmake.in +++ b/cmake/sysstat-config.cmake.in @@ -14,8 +14,7 @@ set(SYSSTAT_VERSION @SYSSTAT_VERSION@) include(CMakeFindDependencyMacro) -find_dependency(Qt5Core REQUIRED QUIET) -find_dependency(Qt5LinguistTools REQUIRED QUIET) +find_dependency(Qt5Core @QT_MINIMUM_VERSION@) if (CMAKE_VERSION VERSION_GREATER 2.8.12) cmake_policy(SET CMP0024 OLD) diff --git a/release.sh b/release.sh deleted file mode 100755 index f344716..0000000 --- a/release.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -PROJECT="libsysstat" -version="$1" -prefix=$PROJECT-$version -shift - -if [[ -z $version ]]; then - >&2 echo "USAGE: $0 " - exit 1 -fi - -mkdir -p "dist/$version" -echo "Creating $prefix.tar.gz" -git archive -9 --format tar.gz $version --prefix="$prefix/" > "dist/$version/$prefix.tar.gz" -gpg --armor --detach-sign "dist/$version/$prefix.tar.gz" -echo "Creating $prefix.tar.xz" -git archive -9 --format tar.xz $version --prefix="$prefix/" > "dist/$version/$prefix.tar.xz" -gpg --armor --detach-sign "dist/$version/$prefix.tar.xz" -cd "dist/$version" - -sha1sum --tag *.tar.gz *.tar.xz >> CHECKSUMS -sha256sum --tag *.tar.gz *.tar.xz >> CHECKSUMS - -cd .. -echo "Uploading to lxqt.org..." - -scp -r "$version" "downloads.lxqt.org:/srv/downloads.lxqt.org/$PROJECT/"