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

Proposed by Dominique Lasserre
Status: Merged
Approved by: Mario Guerriero
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 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
=== modified file 'cmake/FindVala.cmake'
--- cmake/FindVala.cmake 2013-07-23 20:07:11 +0000
+++ cmake/FindVala.cmake 2013-08-08 18:54:58 +0000
@@ -91,7 +91,7 @@
91 string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" min_ver "${VALA_VERSION}")91 string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" min_ver "${VALA_VERSION}")
92 math(EXPR is_odd "${min_ver} % 2")92 math(EXPR is_odd "${min_ver} % 2")
93 if(${is_odd} EQUAL 1)93 if(${is_odd} EQUAL 1)
94 math(EXPR short_ver "${min_ver} + 1")94 math(EXPR min_ver "${min_ver} + 1")
95 endif()95 endif()
96 set(VALA_SHORTVER "${maj_ver}.${min_ver}" CACHE INTERNAL "")96 set(VALA_SHORTVER "${maj_ver}.${min_ver}" CACHE INTERNAL "")
97 if(NOT "${maj_ver}" STREQUAL "" AND NOT "${min_ver}" STREQUAL "")97 if(NOT "${maj_ver}" STREQUAL "" AND NOT "${min_ver}" STREQUAL "")
@@ -110,7 +110,7 @@
110110
111# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call.111# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call.
112# Furthermore set VALA_FOUND to TRUE if Vala has been found (aka.112# Furthermore set VALA_FOUND to TRUE if Vala has been found (aka.
113# VALA_EXECUTABLE is set)113# VALA_EXECUTABLE etc. are set)
114114
115include(FindPackageHandleStandardArgs)115include(FindPackageHandleStandardArgs)
116find_package_handle_standard_args(Vala116find_package_handle_standard_args(Vala
@@ -125,4 +125,6 @@
125 VALA_VALA_GEN_INTROSPECT125 VALA_VALA_GEN_INTROSPECT
126 VERSION_VAR126 VERSION_VAR
127 VALA_VERSION127 VALA_VERSION
128)
129\ No newline at end of file128\ No newline at end of file
129)
130
131# vim: set ai ts=2 sts=2 et sw=2

Subscribers

People subscribed via source and target branches