Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Changes Lua detection to be less strict

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-10-08 10:46:14 +02:00 committed by Patrick Niklaus
parent 45df2c991f
commit 77931ffe24
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmake/FindLuabind.cmake
View File

@ -4,6 +4,8 @@
# LUABIND_LIBRARIES # LUABIND_LIBRARIES
# LUABIND_INCLUDE_DIR, where to find luabind.hpp # LUABIND_INCLUDE_DIR, where to find luabind.hpp
# First we try using EXACT but in some verison of
# cmake this would also match patch versions
FIND_PACKAGE(Lua 5.2 EXACT) FIND_PACKAGE(Lua 5.2 EXACT)
IF (LUA_FOUND) IF (LUA_FOUND)
MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}") MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}")
@ -12,10 +14,23 @@ ELSE()
IF (LUA_FOUND) IF (LUA_FOUND)
MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}") MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}")
ELSE() ELSE()
MESSAGE(FATAL_ERROR "Lua 5.1 or 5.2 was not found.") # Now fall back to a lua verison without exact
# in case this cmake version also forces patch versions
FIND_PACKAGE(Lua 5.2)
IF (LUA_FOUND)
MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}")
ELSE()
FIND_PACKAGE(Lua 5.1)
IF (LUA_FOUND)
MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}")
ELSE()
MESSAGE(FATAL_ERROR "Lua 5.1 or 5.2 was not found.")
ENDIF()
ENDIF()
ENDIF() ENDIF()
ENDIF() ENDIF()
FIND_PATH(LUABIND_INCLUDE_DIR luabind.hpp FIND_PATH(LUABIND_INCLUDE_DIR luabind.hpp
HINTS HINTS
$ENV{LUABIND_DIR} $ENV{LUABIND_DIR}