VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-23 18:52:28 -04:00
Code Issues Projects Releases Wiki Activity

fix version project configuration

Browse Source
This commit is contained in:
Davide Gerhard 2019-05-02 11:03:40 +02:00
parent 8c4de461a1
commit b8bfdcae7e
No known key found for this signature in database
GPG Key ID: 7CBEFA144857DC97
5 changed files with 92 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
CMakeLists.txt
View File

@ -9,16 +9,34 @@ project(sdrangel)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
# set version
SET(sdrangel_VERSION_MAJOR "4")
SET(sdrangel_VERSION_MINOR "5")
SET(sdrangel_VERSION_PATCH "6")
SET(sdrangel_VERSION_SUFFIX "")
SET(sdrangel_VERSION "${sdrangel_VERSION_MAJOR}.${sdrangel_VERSION_MINOR}.${sdrangel_VERSION_PATCH}${sdrangel_VERSION_SUFFIX}")
SET(CPACK_PACKAGE_VERSION "${sdrangel_VERSION_MAJOR}.${sdrangel_VERSION_MINOR}.${sdrangel_VERSION_PATCH}")
SET(CPACK_PACKAGE_VERSION_MAJOR ${sdrangel_VERSION_MAJOR})
SET(CPACK_PACKAGE_VERSION_MINOR ${sdrangel_VERSION_MINOR})
SET(CPACK_PACKAGE_VERSION_PATCH ${sdrangel_VERSION_PATCH})
# configure version
set(SDRANGEL_VERSION_MAJOR "4")
set(SDRANGEL_VERSION_MINOR "5")
set(SDRANGEL_VERSION_PATCH "6")
set(SDRANGEL_VERSION_SUFFIX "")
find_package(Git)
if(GIT_FOUND)
execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse --short HEAD
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
RESULT_VARIABLE res
OUTPUT_VARIABLE out
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(NOT res)
set(SDRANGEL_VERSION_SUFFIX "-${out}")
endif()
endif()
set(SDRANGEL_VERSION "${SDRANGEL_VERSION_MAJOR}.${SDRANGEL_VERSION_MINOR}.${SDRANGEL_VERSION_PATCH}${SDRANGEL_VERSION_SUFFIX}")
message(STATUS "SDRAngel Version: ${SDRANGEL_VERSION}")
add_definitions("-DSDRANGEL_LIB_VERSION=\"${SDRANGEL_VERSION_MAJOR}.${SDRANGEL_VERSION_MINOR}.${SDRANGEL_VERSION_PATCH}\"")
add_definitions("-DSDRANGEL_VERSION=\"${SDRANGEL_VERSION}\"")
set(CPACK_PACKAGE_VERSION "${SDRANGEL_VERSION}")
set(CPACK_PACKAGE_VERSION_MAJOR ${SDRANGEL_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${SDRANGEL_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${SDRANGEL_VERSION_PATCH})
# disable only when needed
set(CMAKE_CXX_STANDARD 11)
@ -208,21 +226,6 @@ elseif (C_GCC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmax-errors=1")
endif()
########## version configuration ############
## need more work
execute_process(
COMMAND git describe --abbrev=8 --always --tags
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_COMMIT_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
add_definitions("-DGIT_COMMIT_HASH=${GIT_COMMIT_HASH}")
set(CPACK_PACKAGE_VERSION ${GIT_COMMIT_HASH})
configure_file(
${CMAKE_SOURCE_DIR}/custom/version.h.in
${CMAKE_BINARY_DIR}/generated/sdrangel_version.h
)
########### include sub-projects ############
if(BUILD_EXTERNAL_LIBRARIES)
@ -277,7 +280,6 @@ endif()
# includes needed by the following target
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/generated
${CMAKE_SOURCE_DIR}/sdrbase
${CMAKE_SOURCE_DIR}/exports
${CMAKE_SOURCE_DIR}/sdrgui

7
app/main.cpp
View File

@ -26,11 +26,6 @@
#include "loggerwithfile.h"
#include "mainwindow.h"
#include "dsp/dsptypes.h"
#ifdef _MSC_VER
#define GIT_COMMIT_HASH_STR "v4.8.0"
#else
#include "sdrangel_version.h"
#endif
static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *logger)
{
@ -41,7 +36,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
*/
QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangel");
QCoreApplication::setApplicationVersion(GIT_COMMIT_HASH_STR);
QCoreApplication::setApplicationVersion(SDRANGEL_VERSION);
#if QT_VERSION >= 0x050600
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps

5
appbench/main.cpp
View File

@ -28,7 +28,6 @@
#include "loggerwithfile.h"
#include "mainbench.h"
#include "dsp/dsptypes.h"
#include "sdrangel_version.h"
void handler(int sig) {
fprintf(stderr, "quit the application by signal(%d).\n", sig);
@ -59,7 +58,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangelBench");
QCoreApplication::setApplicationVersion(GIT_COMMIT_HASH_STR);
QCoreApplication::setApplicationVersion(SDRANGEL_VERSION);
int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));
@ -108,5 +107,3 @@ int main(int argc, char* argv[])
qWarning("SDRangel quit.");
return res;
}

5
appsrv/main.cpp
View File

@ -27,7 +27,6 @@
#include "loggerwithfile.h"
#include "maincore.h"
#include "dsp/dsptypes.h"
#include "sdrangel_version.h"
void handler(int sig) {
fprintf(stderr, "quit the application by signal(%d).\n", sig);
@ -58,7 +57,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangelSrv");
QCoreApplication::setApplicationVersion(GIT_COMMIT_HASH_STR);
QCoreApplication::setApplicationVersion(SDRANGEL_VERSION);
int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));
@ -105,5 +104,3 @@ int main(int argc, char* argv[])
qWarning("SDRangel quit.");
return res;
}

6
custom/version.h.in
View File

@ -1,6 +0,0 @@
#ifndef VERSION_H
#define VERSION_H
#define GIT_COMMIT_HASH_STR "@GIT_COMMIT_HASH@"
#endif