[Cmake-commits] CMake branch, next, updated. v3.7.2-2342-g1d0ed30

[Brad King]

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  1d0ed3063e2e9cc918b9fdcf45bbdb3aa6b0ce09 (commit)
       via  2759e22575b9c63f3162a9629c2d8aa6b9d7effa (commit)
      from  ffd0a359ca89ce397cd2603166b3370cbcfb25ff (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1d0ed3063e2e9cc918b9fdcf45bbdb3aa6b0ce09
commit 1d0ed3063e2e9cc918b9fdcf45bbdb3aa6b0ce09
Merge: ffd0a35 2759e22
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 25 13:48:32 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 13:48:32 2017 -0500

    Merge topic 'FindLua-versioned-lib' into next
    
    2759e225 FindLua: try to find library according to version from header


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2759e22575b9c63f3162a9629c2d8aa6b9d7effa
commit 2759e22575b9c63f3162a9629c2d8aa6b9d7effa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 15:19:34 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 24 15:21:33 2017 -0500

    FindLua: try to find library according to version from header
    
    Patch-by: fft on gitlab.kitware.com
    Issue: #15756

diff --git a/Modules/FindLua.cmake b/Modules/FindLua.cmake
index c777970..b59b9b3 100644
--- a/Modules/FindLua.cmake
+++ b/Modules/FindLua.cmake
@@ -75,16 +75,9 @@ function(_lua_set_version_vars)
              include/lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
              include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
         )
-        list(APPEND _lua_library_names
-             lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
-             lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-             lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-             lua.${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-        )
     endforeach ()
 
     set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE)
-    set(_lua_library_names "${_lua_library_names}" PARENT_SCOPE)
     set(_lua_append_versions "${_lua_append_versions}" PARENT_SCOPE)
 endfunction(_lua_set_version_vars)
 
@@ -152,6 +145,15 @@ endif ()
 unset(_lua_include_subdirs)
 unset(_lua_append_versions)
 
+if (LUA_VERSION_STRING)
+    set(_lua_library_names
+        lua${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR}
+        lua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
+        lua-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
+        lua.${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
+    )
+endif ()
+
 find_library(LUA_LIBRARY
   NAMES ${_lua_library_names} lua
   HINTS

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindLua.cmake |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake