[Cmake-commits] CMake branch, next, updated. v3.0.2-5557-g0463ddc
Rolf Eike Beer
eike at sf-mail.de
Thu Oct 2 15:43:27 EDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 0463ddc7f48b63dbfad1719984d787dfd8c1e292 (commit)
via c4a56b9c1c0f17d7562cf7abfceed8315938393e (commit)
from 7b500d6ab767c4b0d0f9a6901d081e6cad87d4a1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0463ddc7f48b63dbfad1719984d787dfd8c1e292
commit 0463ddc7f48b63dbfad1719984d787dfd8c1e292
Merge: 7b500d6 c4a56b9
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Oct 2 15:43:25 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 2 15:43:25 2014 -0400
Merge topic 'FindLua-exact' into next
c4a56b9c FindLua: fix wrong version list if EXACT is given
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4a56b9c1c0f17d7562cf7abfceed8315938393e
commit c4a56b9c1c0f17d7562cf7abfceed8315938393e
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Oct 2 21:41:43 2014 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Oct 2 21:41:43 2014 +0200
FindLua: fix wrong version list if EXACT is given
diff --git a/Modules/FindLua.cmake b/Modules/FindLua.cmake
index cc35e54..731f5f2 100644
--- a/Modules/FindLua.cmake
+++ b/Modules/FindLua.cmake
@@ -56,7 +56,7 @@ function(set_lua_version_vars)
if (Lua_FIND_VERSION_EXACT)
if (Lua_FIND_VERSION_COUNT GREATER 1)
- set(lua_append_versions ${Lua_FIND_VERSION_MAJOR} ${Lua_FIND_VERSION_MINOR})
+ set(lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR})
endif ()
elseif (Lua_FIND_VERSION)
# once there is a different major version supported this should become a loop
-----------------------------------------------------------------------
Summary of changes:
Modules/FindLua.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list