diff --git a/CMakeLists.txt b/CMakeLists.txt index 731a15fc4..ceacda422 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,20 +3,20 @@ cmake_minimum_required(VERSION 2.8.0) # Project name project(gqrx) set(${PROJECT_NAME}_MAJOR "2") -set(${PROJECT_NAME}_MINOR "9") +set(${PROJECT_NAME}_MINOR "10") set(${PROJECT_NAME}_PATCH "0") ##set(VERSION "${${PROJECT_NAME}_MAJOR}.${${PROJECT_NAME}_MINOR}.${${PROJECT_NAME}_PATCH}") -##set(VERSION "${${PROJECT_NAME}_MAJOR}.${${PROJECT_NAME}_MINOR}") -##add_definitions(-DVERSION="${VERSION}") +set(VERSION "${${PROJECT_NAME}_MAJOR}.${${PROJECT_NAME}_MINOR}") +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 71af52403..22a249baf 100644 --- a/gqrx.pro +++ b/gqrx.pro @@ -67,14 +67,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.9 + ##VER = $$system(git describe --abbrev=8) + VER = 2.10 } else { DEFINES += QT_NO_DEBUG DEFINES += QT_NO_DEBUG_OUTPUT - VER = $$system(git describe --abbrev=1) - ##VER = 2.9 + ##VER = $$system(git describe --abbrev=1) + VER = 2.10 # Release binaries with gr bundled # QMAKE_RPATH & co won't work with origin