[Cmake-commits] CMake branch, next, updated. v3.7.2-2243-ga2ee4ce

[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  a2ee4ce131ae24160c9825aa67f7f38e7eef48ad (commit)
       via  adc04afe34791a90a552fcaefaf30e24b937e1b3 (commit)
      from  d9fc72a88c0b400a34619379c002c34cc9ed7117 (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=a2ee4ce131ae24160c9825aa67f7f38e7eef48ad
commit a2ee4ce131ae24160c9825aa67f7f38e7eef48ad
Merge: d9fc72a adc04af
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 11:51:03 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 11:51:03 2017 -0500

    Merge topic 'add-dl-to-lua-static-linking' into next
    
    adc04afe FindLua: Add dl library to Lua static library linking


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adc04afe34791a90a552fcaefaf30e24b937e1b3
commit adc04afe34791a90a552fcaefaf30e24b937e1b3
Author:     Michael Krasnyk <michael.krasnyk at gmail.com>
AuthorDate: Wed Jan 18 15:22:20 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 11:49:51 2017 -0500

    FindLua: Add dl library to Lua static library linking
    
    If a Lua library is compiled from source as `liblua.a` its link
    dependency on `dl` must be satisfied explicitly.

diff --git a/Modules/FindLua.cmake b/Modules/FindLua.cmake
index 5be0428..c777970 100644
--- a/Modules/FindLua.cmake
+++ b/Modules/FindLua.cmake
@@ -172,6 +172,13 @@ if (LUA_LIBRARY)
     if (UNIX AND NOT APPLE AND NOT BEOS)
         find_library(LUA_MATH_LIBRARY m)
         set(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
+
+        # include dl library for statically-linked Lua library
+        get_filename_component(LUA_LIB_EXT ${LUA_LIBRARY} EXT)
+        if(LUA_LIB_EXT STREQUAL CMAKE_STATIC_LIBRARY_SUFFIX)
+          list(APPEND LUA_LIBRARIES ${CMAKE_DL_LIBS})
+        endif()
+
     # For Windows and Mac, don't need to explicitly include the math library
     else ()
         set(LUA_LIBRARIES "${LUA_LIBRARY}")

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

Summary of changes:


hooks/post-receive
-- 
CMake