From 5ffdd26e5966e9a616905017b65c0176a93b3507 Mon Sep 17 00:00:00 2001 From: Přemysl Eric Janouch Date: Thu, 29 Oct 2020 16:28:18 +0100 Subject: Bump minimum CMake version, related clean up --- CMakeLists.txt | 12 +++++------- README.adoc | 5 +---- config.h.in | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b1dfb1..e16df9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,5 @@ -cmake_minimum_required (VERSION 2.8.5) -project (sensei-raw-ctl C) -set (project_VERSION "1.0") +cmake_minimum_required (VERSION 3.0) +project (sensei-raw-ctl VERSION 1.0 LANGUAGES C) find_package (PkgConfig REQUIRED) pkg_check_modules (dependencies REQUIRED libusb-1.0) @@ -51,7 +50,7 @@ if (BUILD_GUI) target_link_libraries (${PROJECT_NAME}-gui ${gtk3_LIBRARIES}) install (TARGETS ${PROJECT_NAME}-gui DESTINATION ${CMAKE_INSTALL_BINDIR}) -endif (BUILD_GUI) +endif () find_program (HELP2MAN_EXECUTABLE help2man) if (NOT HELP2MAN_EXECUTABLE) @@ -77,18 +76,17 @@ foreach (page ${project_MAN_PAGES}) endforeach () set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "SteelSeries Sensei Raw control utility") -set (CPACK_PACKAGE_VERSION ${project_VERSION}) set (CPACK_PACKAGE_VENDOR "Premysl Eric Janouch") set (CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch ") set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") set (CPACK_GENERATOR "TGZ;ZIP") set (CPACK_PACKAGE_FILE_NAME - "${PROJECT_NAME}-${project_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}") + "${PROJECT_NAME}-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}") set (CPACK_SOURCE_GENERATOR "TGZ;ZIP") set (CPACK_SOURCE_IGNORE_FILES "/\\\\.git;/build;/CMakeLists.txt.user") -set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${project_VERSION}") +set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}") set (CPACK_SET_DESTDIR TRUE) include (CPack) diff --git a/README.adoc b/README.adoc index 229a7f2..591e300 100644 --- a/README.adoc +++ b/README.adoc @@ -28,7 +28,7 @@ a package with the latest development version from Archlinux's AUR. Installation ------------ -Build dependencies: cmake >= 2.8.5, help2man + +Build dependencies: cmake >= 3.0, help2man + Runtime dependencies: libusb >= 1.0, gtk+ >= 3.0 (optional) $ git clone https://git.janouch.name/p/sensei-raw-ctl.git @@ -49,9 +49,6 @@ For Debian-based distros, you can do the following instead of the last step: $ cpack -G DEB # dpkg -i sensei-raw-ctl-*.deb -Note that for versions of CMake before 2.8.9, you need to prefix `cpack` with -`fakeroot` or file ownership will end up wrong. - Contributing and Support ------------------------ Use https://git.janouch.name/p/sensei-raw-ctl to report bugs, request features, diff --git a/config.h.in b/config.h.in index 36afa2c..b951ed3 100644 --- a/config.h.in +++ b/config.h.in @@ -2,7 +2,7 @@ #define CONFIG_H #define PROJECT_NAME "${CMAKE_PROJECT_NAME}" -#define PROJECT_VERSION "${project_VERSION}" +#define PROJECT_VERSION "${PROJECT_VERSION}" #cmakedefine DEVELOPER_MODE #ifdef DEVELOPER_MODE -- cgit v1.2.3-70-g09d2