Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Lua 5.3 support for Fedora 22+, fixes #262

Browse Source 
--HG--
branch : develop
feature/pipeline-tools
kervala 9 years ago
parent 1d0d1a505c
commit 5d3796d225
1 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File

68
code/CMakeModules/FindLuabind.cmake
Unescape Escape View File

@ -9,38 +9,56 @@ MACRO(FIND_CORRECT_LUA_VERSION)
IF(LUABIND_LIBRARY_RELEASE MATCHES "\\.so") IF(LUABIND_LIBRARY_RELEASE MATCHES "\\.so")
INCLUDE(CheckDepends) INCLUDE(CheckDepends)
SET(LUA52_LIBRARY "liblua5.2") # check for Lua 5.3
CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA52_LIBRARY LUALIB_FOUND) SET(LUA53_LIBRARY "liblua5.3")
CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA53_LIBRARY LUALIB_FOUND)
IF(NOT LUALIB_FOUND) IF(NOT LUALIB_FOUND)
# fedora (v20) # fedora (v22+)
SET(LUA52_LIBRARY "liblua-5.2") SET(LUA53_LIBRARY "liblua-5.3")
CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA52_LIBRARY LUALIB_FOUND) CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA53_LIBRARY LUALIB_FOUND)
ENDIF(NOT LUALIB_FOUND) ENDIF()
IF(LUALIB_FOUND) IF(LUALIB_FOUND)
MESSAGE(STATUS "Luabind is using Lua 5.2") MESSAGE(STATUS "Luabind is using Lua 5.3")
FIND_PACKAGE(Lua52 REQUIRED) FIND_PACKAGE(Lua53 REQUIRED)
ELSE(LUALIB_FOUND) ELSE()
SET(LUA51_LIBRARY "liblua5.1") # check for Lua 5.2
CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA51_LIBRARY LUALIB_FOUND) SET(LUA52_LIBRARY "liblua5.2")
CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA52_LIBRARY LUALIB_FOUND)
IF(NOT LUALIB_FOUND)
# fedora (v20)
SET(LUA52_LIBRARY "liblua-5.2")
CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA52_LIBRARY LUALIB_FOUND)
ENDIF()
IF(LUALIB_FOUND) IF(LUALIB_FOUND)
MESSAGE(STATUS "Luabind is using Lua 5.1") MESSAGE(STATUS "Luabind is using Lua 5.2")
FIND_PACKAGE(Lua51 REQUIRED) FIND_PACKAGE(Lua52 REQUIRED)
ELSE(LUALIB_FOUND) ELSE()
SET(LUA50_LIBRARY "liblua5.0") # check for Lua 5.1
CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA50_LIBRARY LUALIB_FOUND) SET(LUA51_LIBRARY "liblua5.1")
CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA51_LIBRARY LUALIB_FOUND)
IF(LUALIB_FOUND) IF(LUALIB_FOUND)
MESSAGE(STATUS "Luabind is using Lua 5.0") MESSAGE(STATUS "Luabind is using Lua 5.1")
FIND_PACKAGE(Lua50 REQUIRED) FIND_PACKAGE(Lua51 REQUIRED)
ELSE(LUALIB_FOUND) ELSE()
MESSAGE(FATAL_ERROR "Can't determine Lua version used by Luabind") # check for Lua 5.0
ENDIF(LUALIB_FOUND) SET(LUA50_LIBRARY "liblua5.0")
ENDIF(LUALIB_FOUND) CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA50_LIBRARY LUALIB_FOUND)
ENDIF(LUALIB_FOUND)
ELSE(LUABIND_LIBRARY_RELEASE MATCHES "\\.so") IF(LUALIB_FOUND)
MESSAGE(STATUS "Luabind is using Lua 5.0")
FIND_PACKAGE(Lua50 REQUIRED)
ELSE()
MESSAGE(FATAL_ERROR "Can't determine Lua version used by Luabind")
ENDIF()
ENDIF()
ENDIF()
ENDIF()
ELSE()
# TODO: find a way to detect Lua version # TODO: find a way to detect Lua version
IF(WITH_LUA53) IF(WITH_LUA53)
FIND_PACKAGE(Lua53 REQUIRED) FIND_PACKAGE(Lua53 REQUIRED)

Write Preview
Loading…
Cancel
Save