Midori Web Browser

Merge lp:~kalikiana/midori/market into lp:midori

  1. market
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6373
Merged at revision: 6376
Proposed branch: lp:~kalikiana/midori/market
Merge into: lp:midori
Diff against target: 27 lines (+9/-1)
1 file modified
CMakeLists.txt (+9/-1)
To merge this branch: bzr merge lp:~kalikiana/midori/market
Reviewer Review Type Date Requested Status
Midori Devs Pending
Review via email: mp+183538@code.launchpad.net

Commit message

Add bzr revision number to version if available

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-09-02 20:16:01 +0000
3+++ CMakeLists.txt 2013-09-03 19:01:38 +0000
4@@ -7,7 +7,6 @@
5 add_definitions("-DPACKAGE_BUGREPORT=\"https://bugs.launchpad.net/midori\"")
6
7 set(VERSION 0.5.5)
8-add_definitions("-DPACKAGE_VERSION=\"${VERSION}\"")
9 add_definitions("-DMIDORI_VERSION_SUFFIX=\"${VERSION}\"")
10
11 string(REPLACE "." ";" VERSION_LIST ${VERSION})
12@@ -18,6 +17,15 @@
13 LIST(GET VERSION_LIST 2 MIDORI_MICRO_VERSION)
14 add_definitions("-DMIDORI_MICRO_VERSION=${MIDORI_MICRO_VERSION}")
15
16+execute_process(COMMAND "bzr" "revno"
17+ OUTPUT_VARIABLE REVISION
18+ ERROR_QUIET
19+ OUTPUT_STRIP_TRAILING_WHITESPACE)
20+if (REVISION)
21+ set(VERSION "${VERSION}~r${REVISION}")
22+endif ()
23+add_definitions("-DPACKAGE_VERSION=\"${VERSION}\"")
24+
25 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
26 # Disallow building during install to avoid permission problems
27 set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1)

Subscribers

People subscribed via source and target branches

to all changes: