From 77931ffe2405b579c0e9c8cd8772957aef75a114 Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Sat, 8 Oct 2016 10:46:14 +0200 Subject: [PATCH] Changes Lua detection to be less strict --- cmake/FindLuabind.cmake | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/cmake/FindLuabind.cmake b/cmake/FindLuabind.cmake index 368e9c02f..10684a215 100644 --- a/cmake/FindLuabind.cmake +++ b/cmake/FindLuabind.cmake @@ -4,6 +4,8 @@ # LUABIND_LIBRARIES # 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) IF (LUA_FOUND) MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}") @@ -12,10 +14,23 @@ ELSE() IF (LUA_FOUND) MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}") 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() + FIND_PATH(LUABIND_INCLUDE_DIR luabind.hpp HINTS $ENV{LUABIND_DIR}