34 lines
1.8 KiB
Diff
34 lines
1.8 KiB
Diff
|
From 5e08ea2cefd61cd50685c54b30d39845fcc485fe Mon Sep 17 00:00:00 2001
|
||
|
|
From: Torben Jaeger <torben@jit-central.com>
|
||
|
|
Date: Thu, 8 Aug 2019 17:37:05 +0200
|
||
|
|
Subject: [PATCH] fix different version format in lua.h
|
||
|
|
|
||
|
|
---
|
||
|
|
cmake/FindLua.cmake | 12 ++++++++++--
|
||
|
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/cmake/FindLua.cmake b/cmake/FindLua.cmake
|
||
|
|
index 6d33dbe..ef9c685 100644
|
||
|
|
--- a/cmake/FindLua.cmake
|
||
|
|
+++ b/cmake/FindLua.cmake
|
||
|
|
@@ -102,9 +102,17 @@ ENDIF(LUA_LIBRARY)
|
||
|
|
|
||
|
|
# Determine Lua version
|
||
|
|
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 .+\"")
|
||
|
|
+ FILE(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_major_str REGEX "^#define[ \t]+LUA_VERSION_MAJOR[ \t]+\".+\"")
|
||
|
|
+ FILE(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_minor_str REGEX "^#define[ \t]+LUA_VERSION_MINOR[ \t]+\".+\"")
|
||
|
|
+ FILE(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_release_str REGEX "^#define[ \t]+LUA_VERSION_RELEASE[ \t]+\".+\"")
|
||
|
|
|
||
|
|
- STRING(REGEX REPLACE "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([^\"]+)\".*" "\\1" LUA_VERSION_STRING "${lua_version_str}")
|
||
|
|
+ STRING(REGEX REPLACE "^#define[ \t]+LUA_VERSION_MAJOR[ \t]+\"([^\"]+)\".*" "\\1" LUA_VERSION_MAJOR "${lua_version_major_str}")
|
||
|
|
+ STRING(REGEX REPLACE "^#define[ \t]+LUA_VERSION_MINOR[ \t]+\"([^\"]+)\".*" "\\1" LUA_VERSION_MINOR "${lua_version_minor_str}")
|
||
|
|
+ STRING(REGEX REPLACE "^#define[ \t]+LUA_VERSION_RELEASE[ \t]+\"([^\"]+)\".*" "\\1" LUA_VERSION_RELEASE "${lua_version_release_str}")
|
||
|
|
+
|
||
|
|
+ STRING(CONCAT LUA_VERSION_STRING ${LUA_VERSION_MAJOR} "." ${LUA_VERSION_MINOR} "." ${LUA_VERSION_RELEASE})
|
||
|
|
+
|
||
|
|
+ #STRING(REGEX REPLACE "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([^\"]+)\".*" "\\1" LUA_VERSION_STRING "${lua_version_str}")
|
||
|
|
UNSET(lua_version_str)
|
||
|
|
ENDIF()
|
||
|
|
|