Merge lp:~lasall/euclide/valacoddversion into lp:euclide

Proposed by Dominique Lasserre on 2013-08-08
Status: Merged
Approved by: Mario Guerriero on 2013-08-09
Approved revision: 140
Merged at revision: 140
Proposed branch: lp:~lasall/euclide/valacoddversion
Merge into: lp:euclide
Diff against target: 30 lines (+5/-3)
1 file modified
cmake/FindVala.cmake (+5/-3)
To merge this branch: bzr merge lp:~lasall/euclide/valacoddversion
Reviewer Review Type Date Requested Status
Euclide Developers 2013-08-08 Pending
Review via email: mp+179254@code.launchpad.net

Description of the change

I propose merging the updated FindVala.cmake from Valama because it fixes an issue with odd minor version number, e.g. current valac 0.21. (Obviously this is not a minimal change to fix this issue but it's a merge.)

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 'cmake/FindVala.cmake'
2--- cmake/FindVala.cmake 2013-07-23 20:07:11 +0000
3+++ cmake/FindVala.cmake 2013-08-08 18:54:58 +0000
4@@ -91,7 +91,7 @@
5 string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" min_ver "${VALA_VERSION}")
6 math(EXPR is_odd "${min_ver} % 2")
7 if(${is_odd} EQUAL 1)
8- math(EXPR short_ver "${min_ver} + 1")
9+ math(EXPR min_ver "${min_ver} + 1")
10 endif()
11 set(VALA_SHORTVER "${maj_ver}.${min_ver}" CACHE INTERNAL "")
12 if(NOT "${maj_ver}" STREQUAL "" AND NOT "${min_ver}" STREQUAL "")
13@@ -110,7 +110,7 @@
14
15 # Handle the QUIETLY and REQUIRED arguments, which may be given to the find call.
16 # Furthermore set VALA_FOUND to TRUE if Vala has been found (aka.
17-# VALA_EXECUTABLE is set)
18+# VALA_EXECUTABLE etc. are set)
19
20 include(FindPackageHandleStandardArgs)
21 find_package_handle_standard_args(Vala
22@@ -125,4 +125,6 @@
23 VALA_VALA_GEN_INTROSPECT
24 VERSION_VAR
25 VALA_VERSION
26-)
27\ No newline at end of file
28+)
29+
30+# vim: set ai ts=2 sts=2 et sw=2

Subscribers

People subscribed via source and target branches