[Cmake-commits] CMake branch, next, updated. v3.7.2-2230-gcba760d

[Ben Boeckel]

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  cba760da8de27c311918f2d33ff7f27193f6e6af (commit)
       via  8c1cfb945a4fe63caa4f5d9fc33fbe2c3731a3ca (commit)
       via  fe8e00f6b91d7e8614af5a5ffb2ab68775b06e1c (commit)
      from  f38f5c7b2003bd0865d395e07f015d5d8c1580a7 (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=cba760da8de27c311918f2d33ff7f27193f6e6af
commit cba760da8de27c311918f2d33ff7f27193f6e6af
Merge: f38f5c7 8c1cfb9
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jan 18 12:30:50 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 18 12:30:50 2017 -0500

    Merge topic 'add-dl-to-lua-static-linking' into next
    
    8c1cfb94 Add dl library to Lua static library linking
    fe8e00f6 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c1cfb945a4fe63caa4f5d9fc33fbe2c3731a3ca
commit 8c1cfb945a4fe63caa4f5d9fc33fbe2c3731a3ca
Author:     Michael Krasnyk <michael.krasnyk at gmail.com>
AuthorDate: Wed Jan 18 15:22:20 2017 +0100
Commit:     Michael Krasnyk <michael.krasnyk at gmail.com>
CommitDate: Wed Jan 18 18:01:50 2017 +0100

    Add dl library to Lua static library linking

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:
 Modules/FindLua.cmake     |    7 +++++++
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake