[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2648-g5716ce2

[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  5716ce2ab6bbcb594082be0c0a31f100c00384c5 (commit)
       via  bcb09ef4abee1696b092c93cc95d583fcac1dec7 (commit)
       via  dc43f7755da1bee7d5c73e75db4bb467bab89073 (commit)
       via  30d029ddd1013bb8d1120d76f5cdfb2b0e09fc81 (commit)
       via  19df4595e27e85187742e100aa202385ad0c330b (commit)
      from  6a0bf5e755dfa6e7572c0a84dd23056fa51e7220 (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=5716ce2ab6bbcb594082be0c0a31f100c00384c5
commit 5716ce2ab6bbcb594082be0c0a31f100c00384c5
Merge: 6a0bf5e bcb09ef
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 17 13:54:44 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 17 13:54:44 2013 -0400

    Merge topic 'add-FindLua52' into next
    
    bcb09ef Add FindLua52 module (#14224)
    dc43f77 CMake Nightly Date Stamp
    30d029d CMake Nightly Date Stamp
    19df459 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bcb09ef4abee1696b092c93cc95d583fcac1dec7
commit bcb09ef4abee1696b092c93cc95d583fcac1dec7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 17 13:43:45 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 17 13:47:45 2013 -0400

    Add FindLua52 module (#14224)
    
    Copy the FindLua51 module to FindLua52 and replease 51 with 52 and 5.1
    with 5.2.  In the future we should refactor all the FindLua*.cmake
    modules to share common infrastructure.

diff --git a/Modules/FindLua52.cmake b/Modules/FindLua52.cmake
new file mode 100644
index 0000000..6b6f9d2
--- /dev/null
+++ b/Modules/FindLua52.cmake
@@ -0,0 +1,80 @@
+# Locate Lua library
+# This module defines
+#  LUA52_FOUND, if false, do not try to link to Lua
+#  LUA_LIBRARIES
+#  LUA_INCLUDE_DIR, where to find lua.h
+#  LUA_VERSION_STRING, the version of Lua found
+#
+# Note that the expected include convention is
+#  #include "lua.h"
+# and not
+#  #include <lua/lua.h>
+# This is because, the lua location is not standardized and may exist
+# in locations other than lua/
+
+#=============================================================================
+# Copyright 2007-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+find_path(LUA_INCLUDE_DIR lua.h
+  HINTS
+    ENV LUA_DIR
+  PATH_SUFFIXES include/lua52 include/lua5.2 include/lua-5.2 include/lua include
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+)
+
+find_library(LUA_LIBRARY
+  NAMES lua52 lua5.2 lua-5.2 lua
+  HINTS
+    ENV LUA_DIR
+  PATH_SUFFIXES lib
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+)
+
+if(LUA_LIBRARY)
+  # include the math library for Unix
+  if(UNIX AND NOT APPLE AND NOT BEOS)
+    find_library(LUA_MATH_LIBRARY m)
+    set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
+  # For Windows and Mac, don't need to explicitly include the math library
+  else()
+    set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
+  endif()
+endif()
+
+if(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
+  file(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_str REGEX "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua .+\"")
+
+  string(REGEX REPLACE "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([^\"]+)\".*" "\\1" LUA_VERSION_STRING "${lua_version_str}")
+  unset(lua_version_str)
+endif()
+
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
+# all listed variables are TRUE
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua52
+                                  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
+                                  VERSION_VAR LUA_VERSION_STRING)
+
+mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)

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

Summary of changes:
 Modules/{FindLua51.cmake => FindLua52.cmake} |   11 +++++------
 Source/CMakeVersion.cmake                    |    2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)
 copy Modules/{FindLua51.cmake => FindLua52.cmake} (90%)


hooks/post-receive
-- 
CMake