From 3b3379ad4bb9c448fb79b503ca117f1ec59f1ae6 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 27 Mar 2017 21:30:46 +0200 Subject: [PATCH] work around bad version matchig in FindToLua.cmake --- CMakeLists.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aecdffb3a..892c5b4f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,10 +12,14 @@ enable_testing() find_package (LibXml2) find_package (SQLite3) find_package (Curses) -find_package (Lua 5.1 REQUIRED) -if (LUA_FOUND) -find_package (ToLua "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}" EXACT REQUIRED) -endif(LUA_FOUND) +find_package (ToLua REQUIRED) +if (TOLUA_FOUND) +if (${TOLUA_VERSION_STRING} VERSION_EQUAL "5.2") +find_package (Lua 5.2 REQUIRED) +elseif (${TOLUA_VERSION_STRING} VERSION_EQUAL "5.1") +find_package (Lua 5.2 REQUIRED) +endif() +endif(TOLUA_FOUND) add_subdirectory (cJSON) add_subdirectory (storage)