Skip to content

Commit

Permalink
Update version to 2.8
Browse files Browse the repository at this point in the history
  • Loading branch information
csete committed Sep 16, 2017
1 parent 18d86ea commit 39084ef
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 2.8.0)
# Project name
project(gqrx)
set(${PROJECT_NAME}_MAJOR "2")
set(${PROJECT_NAME}_MINOR "7")
set(${PROJECT_NAME}_MINOR "8")
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(
Expand All @@ -16,7 +16,7 @@ execute_process(
OUTPUT_VARIABLE GITVERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
add_definitions(-DVERSION="${GITVERSION}")
##add_definitions(-DVERSION="${GITVERSION}")

set(PACKAGE ${PROJECT_NAME})

Expand Down
8 changes: 4 additions & 4 deletions gqrx.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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.6
##VER = $$system(git describe --abbrev=8)
VER = 2.8

} else {
DEFINES += QT_NO_DEBUG
DEFINES += QT_NO_DEBUG_OUTPUT
VER = $$system(git describe --abbrev=1)
##VER = 2.6
##VER = $$system(git describe --abbrev=1)
VER = 2.8

# Release binaries with gr bundled
# QMAKE_RPATH & co won't work with origin
Expand Down

0 comments on commit 39084ef

Please sign in to comment.