Merge pull request darktable-org#984 from beedaddy/lua52

Changed so that (only) lua 5.2.x gets accepted
pa7n · Oct 15, 2015 · b98b370 · b98b370
2 parents 113469c + 03866a4
commit b98b370
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmake/modules/FindLua52.cmake b/cmake/modules/FindLua52.cmake
@@ -2,6 +2,7 @@ SET(LUA52_FIND_REQUIRED ${Lua52_FIND_REQUIRED})
 SET(LUA52_FIND_VERSION ${Lua52_FIND_VERSION})
 SET(LUA52_FIND_VERSION_EXACT ${Lua52_FIND_VERSION_EXACT})
 SET(LUA52_FIND_QUIETLY ${Lua52_FIND_QUIETLY})
+SET(LUA_VERSION_TOO_HIGH 5.3)
 
 include(Prebuilt)
 include(FindPkgConfig)
@@ -18,7 +19,8 @@ if(LUA52_FIND_VERSION)
     endif()
   else()
     if(LUA52_VERSION VERSION_EQUAL   LUA52_FIND_VERSION OR
-       LUA52_VERSION VERSION_GREATER LUA52_FIND_VERSION)
+       LUA52_VERSION VERSION_GREATER LUA52_FIND_VERSION AND
+       LUA52_VERSION VERSION_LESS LUA_VERSION_TOO_HIGH)
       set(LUA52_FAILED_VERSION_CHECK false)
     endif()
   endif()

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -450,7 +450,7 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
 # Build external deps
 #
 if(USE_LUA)
-  find_package(Lua52 5.2 EXACT)
+  find_package(Lua52 5.2)
   if(LUA52_FOUND)
     message(STATUS "Lua support: Enabled")
     include_directories(SYSTEM ${LUA52_INCLUDE_DIRS})