diff --git a/CMakeLists.txt b/CMakeLists.txt index fe42f12..03b5c75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,10 @@ cmake_minimum_required(VERSION 3.16.0) -project(pipedal VERSION 0.1.0) +project(pipedal + VERSION 0.1.0 + DESCRIPTION "PiPedal Guitar Effect Pedal For Raspberry Pi" + HOMEPAGE_URL "https://github.com/rerdavies/pipedal" +) +set (DISPLAY_VERSION "v0.1.0.alpha.1") include(CTest) enable_testing() @@ -60,9 +65,11 @@ set(CPACK_DEBIAN_PACKAGE_SECTION non-free/sound) set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_PACKAGE_PREDEPENDS hostapd authbind ) set(CPACK_DEBIAN_PACKAGE_CONTROL_STRICT_PERMISSION TRUE) +#set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "arm64") set(CPACK_PACKAGING_INSTALL_PREFIX /usr/local) set(CPACK_PROJECT_NAME ${PROJECT_NAME}) set(CPACK_PROJECT_VERSION ${PROJECT_VERSION}) +set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT) set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst") diff --git a/package b/package index e07eb29..1cc225e 100755 --- a/package +++ b/package @@ -1 +1,2 @@ -cpack -G DEB -C Release -config build/CPackConfig.cmake pipedal \ No newline at end of file +cd build +cpack -G DEB -C Release -config CPackConfig.cmake diff --git a/src/PiPedalVersion.cpp b/src/PiPedalVersion.cpp index 300cc5b..98bf328 100644 --- a/src/PiPedalVersion.cpp +++ b/src/PiPedalVersion.cpp @@ -42,7 +42,7 @@ PiPedalVersion::PiPedalVersion() { server_ = "PiPedal Server"; // defined on build command line. - serverVersion_ = PROJECT_VER; + serverVersion_ = PROJECT_DISPLAY_VERSION; #ifdef _WIN32 OSVERSIONINFOEXA info; ZeroMemory(&info, sizeof(OSVERSIONINFOEA)); diff --git a/src/config.hpp.in b/src/config.hpp.in index b283b02..9785ee0 100644 --- a/src/config.hpp.in +++ b/src/config.hpp.in @@ -24,7 +24,11 @@ #define PROJECT_VER "@PROJECT_VERSION@" #define PROJECT_VER_MAJOR "@PROJECT_VERSION_MAJOR@" #define PROJECT_VER_MINOR "@PROJECT_VERSION_MINOR@" -#define PTOJECT_VER_PATCH "@PROJECT_VERSION_PATCH@" +#define PROJECT_VER_PATCH "@PROJECT_VERSION_PATCH@" + +#define PROJECT_DISPLAY_VERSION "@DISPLAY_VERSION@" + + #endif // CONFIG_HPP_H