diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 513eaeb..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -*.kdev4 diff --git a/CHANGELOG b/CHANGELOG index c595fe3..9715f51 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,15 @@ -lxqt-qtplugin-0.11.0 / 2016-09-24 +lxqt-qtplugin-0.11.1 / 2016-12-11 ================================= + * Use lxqt-build-tools + * Use the new lxqt-build-tools package + * Remove cpack (#14) + +0.11.0 / 2016-09-24 +=================== + + * Release 0.11.0: Add changelog * Add Qt5XdgIconLoader as dependency (#13) * Update README.md * statusnotifieritem: Correctly handle menu diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e3607f..e0a05ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,28 +1,25 @@ cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR) project(lxqt-qtplugin) +include(GNUInstallDirs) + +set(LXQTBT_MINIMUM_VERSION "0.1.0") + +set(CMAKE_AUTOMOC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_AUTOMOC ON) find_package(Qt5Widgets REQUIRED QUIET) find_package(Qt5LinguistTools REQUIRED QUIET) find_package(Qt5DBus REQUIRED QUIET) find_package(dbusmenu-qt5 REQUIRED QUIET) - -find_package(lxqt REQUIRED QUIET) +find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED) find_package(Qt5XdgIconLoader REQUIRED QUIET) include(LXQtCompilerSettings NO_POLICY_SCOPE) -add_subdirectory(src) +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) +endif() -# 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) +add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 094f9d3..7723c04 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,7 +30,6 @@ target_link_libraries(qtlxqt Qt5::Widgets Qt5::DBus dbusmenu-qt5 - lxqt Qt5XdgIconLoader )