Root/plplot/patches/006-fix-lua.patch

1Index: plplot-5.9.7/cmake/modules/lua.cmake
2===================================================================
3--- plplot-5.9.7.orig/cmake/modules/lua.cmake 2011-01-15 16:08:33.000000000 +0100
4+++ plplot-5.9.7/cmake/modules/lua.cmake 2011-01-15 16:12:37.000000000 +0100
5@@ -75,8 +75,8 @@
6   find_program(LUA_EXECUTABLE lua)
7   if(NOT LUA_EXECUTABLE)
8     message(STATUS "WARNING: "
9- "Lua executable not found. Disabling Lua bindings")
10- set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE)
11+ "Lua executable not found. But no problem.")
12+ #set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE)
13   endif(NOT LUA_EXECUTABLE)
14 endif(ENABLE_lua)
15 
16@@ -90,22 +90,22 @@
17     ERROR_STRIP_TRAILING_WHITESPACE
18     )
19   #message("(preliminary) LUA_VERSION = ${LUA_VERSION}")
20- string(REGEX MATCH "[0-9]\\.[0-9]\\.[0-9]" LUA_VERSION "${LUA_VERSION}")
21+# string(REGEX MATCH "[0-9]\\.[0-9]\\.[0-9]" LUA_VERSION "${LUA_VERSION}")
22   #message("(dotted triplet) LUA_VERSION = ${LUA_VERSION}")
23   # Reduce to just major.minor for purposes of comparison.
24- string(SUBSTRING "${LUA_VERSION}" 0 3 LUA_VERSION)
25- message(STATUS "LUA_VERSION = ${LUA_VERSION}")
26- set(LUA_VERSION_VALID)
27- if(${LUA_VERSION} STREQUAL "5.0" AND LUA50_FOUND)
28- set(LUA_VERSION_VALID ON)
29- elseif(${LUA_VERSION} STREQUAL "5.1" AND LUA51_FOUND)
30- set(LUA_VERSION_VALID ON)
31- endif(${LUA_VERSION} STREQUAL "5.0" AND LUA50_FOUND)
32+# string(SUBSTRING "${LUA_VERSION}" 0 3 LUA_VERSION)
33+# message(STATUS "LUA_VERSION = ${LUA_VERSION}")
34+ set(LUA_VERSION_VALID ON)
35+# if(${LUA_VERSION} STREQUAL "5.0" AND LUA50_FOUND)
36+# set(LUA_VERSION_VALID ON)
37+# elseif(${LUA_VERSION} STREQUAL "5.1" AND LUA51_FOUND)
38+# set(LUA_VERSION_VALID ON)
39+# endif(${LUA_VERSION} STREQUAL "5.0" AND LUA50_FOUND)
40 
41   if(NOT LUA_VERSION_VALID)
42     message(STATUS "WARNING: "
43- "Lua executable found but version not consistent with library. Disabling Lua bindings")
44- set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE)
45+ "Lua executable found but version not consistent with library. Continuing anyways.")
46+ # set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE)
47   endif(NOT LUA_VERSION_VALID)
48 endif(ENABLE_lua)
49 
50

Archive Download this file

Branches:
backfire
master
release_2010-11-17
release_2010-12-14
release_2011-02-23
release_2011-05-28
release_2011-08-27
release_2011-11-13
release_2012-03-18
release_2012-04-09
release_2012-07-11
release_2012-10-11



interactive