diff --git a/CMakeLists.txt b/CMakeLists.txt index 387896794..6312c1fbd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,19 +5,19 @@ cmake_minimum_required(VERSION 2.8.0) project(gqrx) set(${PROJECT_NAME}_MAJOR "2") set(${PROJECT_NAME}_MINOR "5") -#set(${PROJECT_NAME}_PATCH "0") -#set(VERSION "${${PROJECT_NAME}_MAJOR}.${${PROJECT_NAME}_MINOR}.${${PROJECT_NAME}_PATCH}") +set(${PROJECT_NAME}_PATCH "2") +set(VERSION "${${PROJECT_NAME}_MAJOR}.${${PROJECT_NAME}_MINOR}.${${PROJECT_NAME}_PATCH}") #set(VERSION "${${PROJECT_NAME}_MAJOR}.${${PROJECT_NAME}_MINOR}") -#add_definitions(-DVERSION="${VERSION}") +add_definitions(-DVERSION="${VERSION}") # development version -execute_process( - COMMAND git describe --long --dirty - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE GITVERSION - OUTPUT_STRIP_TRAILING_WHITESPACE -) -add_definitions(-DVERSION="${GITVERSION}") +##execute_process( +## COMMAND git describe --long --dirty +## WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +## OUTPUT_VARIABLE GITVERSION +## OUTPUT_STRIP_TRAILING_WHITESPACE +##) +##add_definitions(-DVERSION="${GITVERSION}") set(PACKAGE ${PROJECT_NAME}) diff --git a/gqrx.pro b/gqrx.pro index ee6f9fc12..f5a376c8e 100644 --- a/gqrx.pro +++ b/gqrx.pro @@ -59,14 +59,14 @@ CONFIG(debug, debug|release) { #QMAKE_CFLAGS_DEBUG += '-g -O0' # Define version string (see below for releases) - VER = $$system(git describe --abbrev=8) - ##VER = 2.5 + ##VER = $$system(git describe --abbrev=8) + VER = 2.5.2 } else { DEFINES += QT_NO_DEBUG DEFINES += QT_NO_DEBUG_OUTPUT - VER = $$system(git describe --abbrev=1) - ##VER = 2.5 + ##VER = $$system(git describe --abbrev=1) + VER = 2.5.2 # Release binaries with gr bundled # QMAKE_RPATH & co won't work with origin