[Cmake-commits] CMake branch, next, updated. v3.5.2-1293-g20913ed

Brad King brad.king at kitware.com
Mon May 9 09:11:49 EDT 2016


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  20913edb0538920f0bc0c5f48d0f034564ab7fb8 (commit)
       via  25f34deab6501258200cfebb6d7d84490bc092af (commit)
      from  0972a1d937fa89ab3ae7a7ef93165ccf66feef5a (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=20913edb0538920f0bc0c5f48d0f034564ab7fb8
commit 20913edb0538920f0bc0c5f48d0f034564ab7fb8
Merge: 0972a1d 25f34de
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 9 09:11:49 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 9 09:11:49 2016 -0400

    Merge topic 'FindLua-homebrew' into next
    
    25f34dea FindLua: Add library name for Lua 5.3 on homebrew


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25f34deab6501258200cfebb6d7d84490bc092af
commit 25f34deab6501258200cfebb6d7d84490bc092af
Author:     Anders Bakken <agbakken at gmail.com>
AuthorDate: Sat May 7 12:11:27 2016 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 9 09:10:05 2016 -0400

    FindLua: Add library name for Lua 5.3 on homebrew
    
    Homebrew installs lua 5.3 like this:
    
        Cellar/lua53/5.3.2_2/lib/liblua.5.3.2.dylib
        Cellar/lua53/5.3.2_2/lib/liblua.5.3.dylib
        lib/liblua.5.3.2.dylib
        lib/liblua.5.3.dylib
    
    Add the `liblua.{$VERSION}` naming scheme to our searched names.

diff --git a/Modules/FindLua.cmake b/Modules/FindLua.cmake
index 731f5f2..4e00a92 100644
--- a/Modules/FindLua.cmake
+++ b/Modules/FindLua.cmake
@@ -87,6 +87,7 @@ function(set_lua_version_vars)
              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 ()
 

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

Summary of changes:
 Modules/FindLua.cmake |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list