Changeset 11100 for code/trunk

Timestamp:

Jan 28, 2016, 3:56:24 PM (8 years ago)

Author:

muemart

Message:

Update FindLua5.1.cmake to work with newer versions. Also added another path suffix for include directories.

File:

• code/trunk/cmake/tools/FindLua5.1.cmake (modified) (3 diffs)

code/trunk/cmake/tools/FindLua5.1.cmake

@@ -31 +31 @@
 INCLUDE(HandleLibraryTypes)
 
-# Macro that determines Lua version. Should work for versions 2.2 and above (current release: 5.1.4)
+# Macro that determines Lua version. Should work for versions 2.2 and above (current release: 5.3.2)
 FUNCTION(DETERMINE_LUA_VERSION _file _varname)
   IF(EXISTS ${_file})
@@ -44 +44 @@
     STRING(REGEX REPLACE "^.*LUA_VERSION[ \t]+\"Lua[ \t]+([.0-9]+)\".*$" "\\1" ${_varname} "${_file_content}")
     IF(${_varname} STREQUAL "${_file_content}")
-      MESSAGE(FATAL_ERROR "Could not determine Lua version which means this script has a bug")
+      # Last chance, search for LUA_VERSION_MAJOR and LUA_VERSION_MINOR
+      STRING(REGEX REPLACE "^.*LUA_VERSION_MAJOR[ \t]+\"([0-9]+)\".*$" "\\1" _major "${_file_content}")
+      STRING(REGEX REPLACE "^.*LUA_VERSION_MINOR[ \t]+\"([0-9]+)\".*$" "\\1" _minor "${_file_content}")
+      IF(_major STREQUAL "${_file_content}" OR _minor STREQUAL "${_file_content}")
+        MESSAGE(FATAL_ERROR "Could not determine Lua version which means this script has a bug")
+      ENDIF()
+      SET(${_varname} "${_major}.${_minor}")
     ENDIF()
     IF(${_varname} MATCHES "^[0-9]+\\.[0-9]+$")
@@ -57 +63 @@
 FIND_PATH(LUA5.1_INCLUDE_DIR lua.h
   PATHS $ENV{LUA5.1_DIR} $ENV{LUA_DIR}
-  PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
+  PATH_SUFFIXES lua5.1 include/lua51 include/lua5.1 include/lua include
 )