Skip to content

Commit 964f505

Browse files
nuivenuive
committed
Scripting: Fix Lua 5.1/LuaJIT and Lua 5.2 problems
1 parent d82fc3d commit 964f505

File tree

3 files changed

+330
-30
lines changed

3 files changed

+330
-30
lines changed

‎CMakeLists.txt

+17-6
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,9 @@ endif()
768768
if(ENABLE_SCRIPTING)
769769
list(APPEND ENABLES SCRIPTING)
770770
find_feature(USE_JSON_C "json-c")
771-
if(NOT USE_LUA VERSION_LESS 5.1)
771+
if(USE_LUA STREQUAL "JIT")
772+
find_feature(USE_LUA "LuaJIT")
773+
elseif(NOT USE_LUA VERSION_LESS 5.1)
772774
find_feature(USE_LUA "Lua" ${USE_LUA})
773775
else()
774776
find_feature(USE_LUA "Lua")
@@ -799,10 +801,17 @@ if(ENABLE_SCRIPTING)
799801
endif()
800802
if(USE_LUA)
801803
list(APPEND FEATURE_DEFINES USE_LUA)
802-
include_directories(AFTER ${LUA_INCLUDE_DIR})
803-
list(APPEND FEATURE_DEFINES LUA_VERSION_ONLY=\"${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}\")
804-
list(APPEND DEPENDENCY_LIB ${LUA_LIBRARY})
805-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},liblua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}-0")
804+
if(USE_LUA STREQUAL "JIT")
805+
include_directories(AFTER ${LUAJIT_INCLUDE_DIR})
806+
list(APPEND FEATURE_DEFINES LUA_VERSION_ONLY=\"${LUAJIT_VERSION_MAJOR}.${LUAJIT_VERSION_MINOR}\")
807+
list(APPEND DEPENDENCY_LIB ${LUAJIT_LIBRARY})
808+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libluajit${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}-0")
809+
else()
810+
include_directories(AFTER ${LUA_INCLUDE_DIR})
811+
list(APPEND FEATURE_DEFINES LUA_VERSION_ONLY=\"${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}\")
812+
list(APPEND DEPENDENCY_LIB ${LUA_LIBRARY})
813+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},liblua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}-0")
814+
endif()
806815
endif()
807816

808817
if(BUILD_PYTHON)
@@ -1308,7 +1317,9 @@ if(NOT QUIET AND NOT LIBMGBA_ONLY)
13081317
message(STATUS " OpenGL support: ${SUMMARY_GL}")
13091318
message(STATUS "Scripting support: ${ENABLE_SCRIPTING}")
13101319
if(ENABLE_SCRIPTING)
1311-
if(LUA_VERSION_STRING)
1320+
if(LUAJIT_VERSION_STRING)
1321+
message(STATUS " Lua: JIT ${LUAJIT_VERSION_STRING}")
1322+
elseif(LUA_VERSION_STRING)
13121323
message(STATUS " Lua: ${LUA_VERSION_STRING}")
13131324
else()
13141325
message(STATUS " Lua: ${USE_LUA}")

‎src/platform/cmake/FindLuaJIT.cmake

+225
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,225 @@
1+
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
2+
# file Copyright.txt or https://cmake.org/licensing for details.
3+
4+
#[=======================================================================[.rst:
5+
FindLuaJIT
6+
-------
7+
8+
Locate LuaJIT library.
9+
10+
This module defines:
11+
12+
``LUAJIT_FOUND``
13+
if false, do not try to link to LuaJIT
14+
``LUAJIT_LIBRARIES``
15+
both luajit and luajitlib
16+
``LUAJIT_INCLUDE_DIR``
17+
where to find luajit.h
18+
``LUAJIT_VERSION_STRING``
19+
the version of LuaJIT found
20+
``LUAJIT_VERSION_MAJOR``
21+
the major version of LuaJIT
22+
``LUAJIT_VERSION_MINOR``
23+
the minor version of LuaJIT
24+
``LUAJIT_VERSION_PATCH``
25+
the patch version of LuaJIT
26+
#]=======================================================================]
27+
28+
cmake_policy(PUSH) # Policies apply to functions at definition-time
29+
cmake_policy(SET CMP0012 NEW) # For while(TRUE)
30+
31+
unset(_luajit_include_subdirs)
32+
unset(_luajit_library_names)
33+
unset(_luajit_append_versions)
34+
35+
# this is a function only to have all the variables inside go away automatically
36+
function(_luajit_get_versions)
37+
set(LUAJIT_VERSIONS2 2.1 2.0)
38+
39+
if (LuaJIT_FIND_VERSION_EXACT)
40+
if (LuaJIT_FIND_VERSION_COUNT GREATER 1)
41+
set(_luajit_append_versions ${LuaJIT_FIND_VERSION_MAJOR}.${LuaJIT_FIND_VERSION_MINOR})
42+
endif ()
43+
elseif (LuaJIT_FIND_VERSION)
44+
# once there is a different major version supported this should become a loop
45+
if (NOT LuaJIT_FIND_VERSION_MAJOR GREATER 2)
46+
if (LuaJIT_FIND_VERSION_COUNT EQUAL 1)
47+
set(_luajit_append_versions ${LUAJIT_VERSIONS2})
48+
else ()
49+
foreach (subver IN LISTS LUAJIT_VERSIONS2)
50+
if (NOT subver VERSION_LESS ${LuaJIT_FIND_VERSION})
51+
list(APPEND _luajit_append_versions ${subver})
52+
endif ()
53+
endforeach ()
54+
# New version -> Search for it (heuristic only! Defines in include might have changed)
55+
if (NOT _luajit_append_versions)
56+
set(_luajit_append_versions ${LuaJIT_FIND_VERSION_MAJOR}.${LuaJIT_FIND_VERSION_MINOR})
57+
endif()
58+
endif ()
59+
endif ()
60+
else ()
61+
# once there is a different major version supported this should become a loop
62+
set(_luajit_append_versions ${LUAJIT_VERSIONS2})
63+
endif ()
64+
65+
if (LUAJIT_Debug)
66+
message(STATUS "Considering following LuaJIT versions: ${_luajit_append_versions}")
67+
endif()
68+
69+
set(_luajit_append_versions "${_luajit_append_versions}" PARENT_SCOPE)
70+
endfunction()
71+
72+
function(_luajit_set_version_vars)
73+
set(_luajit_include_subdirs_raw "luajit")
74+
75+
foreach (ver IN LISTS _luajit_append_versions)
76+
string(REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}")
77+
if (_ver)
78+
string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)$" "\\1" _version_major "${ver}")
79+
string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)$" "\\2" _version_minor "${ver}")
80+
list(APPEND _luajit_include_subdirs_raw
81+
luajit${_version_major}${_version_minor}
82+
luajit${_version_major}.${_version_minor}
83+
luajit-${_version_major}.${_version_minor}
84+
)
85+
endif ()
86+
endforeach ()
87+
88+
# Prepend "include/" to each path directly after the path
89+
set(_luajit_include_subdirs "include")
90+
foreach (dir IN LISTS _luajit_include_subdirs_raw)
91+
list(APPEND _luajit_include_subdirs "${dir}" "include/${dir}")
92+
endforeach ()
93+
94+
set(_luajit_include_subdirs "${_luajit_include_subdirs}" PARENT_SCOPE)
95+
endfunction(_luajit_set_version_vars)
96+
97+
function(_luajit_get_header_version)
98+
unset(LUAJIT_VERSION_STRING PARENT_SCOPE)
99+
set(_hdr_file "${LUAJIT_INCLUDE_DIR}/luajit.h")
100+
101+
if (NOT EXISTS "${_hdr_file}")
102+
return()
103+
endif ()
104+
105+
file(STRINGS "${_hdr_file}" luajit_version_strings
106+
REGEX "^#define[ \t]+LUAJIT_VERSION[ \t]+\"LuaJIT [0-9].*")
107+
108+
string(REGEX REPLACE ".*;#define[ \t]+LUAJIT_VERSION_MAJOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUAJIT_VERSION_MAJOR ";${luajit_version_strings};")
109+
if (LUAJIT_VERSION_MAJOR MATCHES "^[0-9]+$")
110+
string(REGEX REPLACE ".*;#define[ \t]+LUAJIT_VERSION_MINOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUAJIT_VERSION_MINOR ";${luajit_version_strings};")
111+
string(REGEX REPLACE ".*;#define[ \t]+LUAJIT_VERSION_RELEASE[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUAJIT_VERSION_PATCH ";${luajit_version_strings};")
112+
set(LUAJIT_VERSION_STRING "${LUAJIT_VERSION_MAJOR}.${LUAJIT_VERSION_MINOR}.${LUAJIT_VERSION_PATCH}")
113+
else ()
114+
string(REGEX REPLACE ".*;#define[ \t]+LUAJIT_VERSION[ \t]+\"LuaJIT ([0-9.]+[^\"]*)\"[ \t]*;.*" "\\1" LUAJIT_VERSION_STRING ";${luajit_version_strings};")
115+
string(REGEX REPLACE "^([0-9]+)\\.[^\"]*$" "\\1" LUAJIT_VERSION_MAJOR "${LUAJIT_VERSION_STRING}")
116+
string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[^\"]*$" "\\1" LUAJIT_VERSION_MINOR "${LUAJIT_VERSION_STRING}")
117+
string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" LUAJIT_VERSION_PATCH "${LUAJIT_VERSION_STRING}")
118+
endif ()
119+
foreach (ver IN LISTS _luajit_append_versions)
120+
if (ver STREQUAL "${LUAJIT_VERSION_MAJOR}.${LUAJIT_VERSION_MINOR}")
121+
set(LUAJIT_VERSION_MAJOR ${LUAJIT_VERSION_MAJOR} PARENT_SCOPE)
122+
set(LUAJIT_VERSION_MINOR ${LUAJIT_VERSION_MINOR} PARENT_SCOPE)
123+
set(LUAJIT_VERSION_PATCH ${LUAJIT_VERSION_PATCH} PARENT_SCOPE)
124+
set(LUAJIT_VERSION_STRING ${LUAJIT_VERSION_STRING} PARENT_SCOPE)
125+
return()
126+
endif ()
127+
endforeach ()
128+
endfunction(_luajit_get_header_version)
129+
130+
function(_luajit_find_header)
131+
_luajit_set_version_vars()
132+
133+
# Initialize as local variable
134+
set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH})
135+
while (TRUE)
136+
# Find the next header to test. Check each possible subdir in order
137+
# This prefers e.g. higher versions as they are earlier in the list
138+
# It is also consistent with previous versions of FindLua
139+
foreach (subdir IN LISTS _luajit_include_subdirs)
140+
find_path(LUAJIT_INCLUDE_DIR luajit.h
141+
HINTS ENV LUAJIT_DIR
142+
PATH_SUFFIXES ${subdir}
143+
)
144+
if (LUAJIT_INCLUDE_DIR)
145+
break()
146+
endif()
147+
endforeach()
148+
# Did not found header -> Fail
149+
if (NOT LUAJIT_INCLUDE_DIR)
150+
return()
151+
endif()
152+
_luajit_get_header_version()
153+
# Found accepted version -> Ok
154+
if (LUAJIT_VERSION_STRING)
155+
if (LUAJIT_Debug)
156+
message(STATUS "Found suitable version ${LUAJIT_VERSION_STRING} in ${LUAJIT_INCLUDE_DIR}/lua.h")
157+
endif()
158+
return()
159+
endif()
160+
# Found wrong version -> Ignore this path and retry
161+
if (LUAJIT_Debug)
162+
message(STATUS "Ignoring unsuitable version in ${LUAJIT_INCLUDE_DIR}")
163+
endif()
164+
list(APPEND CMAKE_IGNORE_PATH "${LUAJIT_INCLUDE_DIR}")
165+
unset(LUAJIT_INCLUDE_DIR CACHE)
166+
unset(LUAJIT_INCLUDE_DIR)
167+
unset(LUAJIT_INCLUDE_DIR PARENT_SCOPE)
168+
endwhile ()
169+
endfunction()
170+
171+
_luajit_get_versions()
172+
_luajit_find_header()
173+
_luajit_get_header_version()
174+
unset(_luajit_append_versions)
175+
176+
if (LUAJIT_VERSION_STRING)
177+
set(_luajit_library_names
178+
luajit${LUAJIT_VERSION_MAJOR}${LUAJIT_VERSION_MINOR}
179+
luajit${LUAJIT_VERSION_MAJOR}.${LUAJIT_VERSION_MINOR}
180+
luajit-${LUAJIT_VERSION_MAJOR}.${LUAJIT_VERSION_MINOR}
181+
luajit.${LUAJIT_VERSION_MAJOR}.${LUAJIT_VERSION_MINOR}
182+
lua51
183+
lua5.1
184+
lua-5.1
185+
lua.5.1
186+
)
187+
endif ()
188+
189+
find_library(LUAJIT_LIBRARY
190+
NAMES ${_luajit_library_names} luajit
191+
NAMES_PER_DIR
192+
HINTS
193+
ENV LUAJIT_DIR
194+
PATH_SUFFIXES lib
195+
)
196+
unset(_luajit_library_names)
197+
198+
if (LUAJIT_LIBRARY)
199+
# include the math library for Unix
200+
if (UNIX AND NOT APPLE AND NOT BEOS)
201+
find_library(LUAJIT_MATH_LIBRARY m)
202+
mark_as_advanced(LUAJIT_MATH_LIBRARY)
203+
set(LUAJIT_LIBRARIES "${LUAJIT_LIBRARY};${LUAJIT_MATH_LIBRARY}")
204+
205+
# include dl library for statically-linked Lua library
206+
get_filename_component(LUAJIT_LIB_EXT ${LUAJIT_LIBRARY} EXT)
207+
if(LUAJIT_LIB_EXT STREQUAL CMAKE_STATIC_LIBRARY_SUFFIX)
208+
list(APPEND LUAJIT_LIBRARIES ${CMAKE_DL_LIBS})
209+
endif()
210+
211+
# For Windows and Mac, don't need to explicitly include the math library
212+
else ()
213+
set(LUAJIT_LIBRARIES "${LUAJIT_LIBRARY}")
214+
endif ()
215+
endif ()
216+
217+
# handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE if
218+
# all listed variables are TRUE
219+
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJIT
220+
REQUIRED_VARS LUAJIT_LIBRARIES LUAJIT_INCLUDE_DIR
221+
VERSION_VAR LUAJIT_VERSION_STRING)
222+
223+
mark_as_advanced(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARY)
224+
225+
cmake_policy(POP)

0 commit comments

Comments
 (0)