From: Felix Fietkau Date: Sat, 26 Mar 2011 20:46:11 +0000 (+0100) Subject: allow the user to override the lua path X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=commitdiff_plain;h=84274d6a58282dfb23c77008e14d6c500c0723f1 allow the user to override the lua path --- diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt index 69079c9..ad773a4 100644 --- a/lua/CMakeLists.txt +++ b/lua/CMakeLists.txt @@ -10,15 +10,17 @@ IF(APPLE) SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -undefined dynamic_lookup") ENDIF(APPLE) -EXECUTE_PROCESS( - COMMAND lua -e "for k in string.gmatch(package.cpath .. \";\", \"([^;]+)/..so;\") do if k:sub(1,1) == \"/\" then print(k) break end end" - OUTPUT_VARIABLE LUAPATH - RESULT_VARIABLE LUA_CHECK_RES - OUTPUT_STRIP_TRAILING_WHITESPACE -) - -IF(NOT ${LUA_CHECK_RES} EQUAL 0 OR ${LUAPATH} EQUAL "") - MESSAGE(SEND_ERROR "Lua was not found on your system") +IF(NOT LUAPATH) + EXECUTE_PROCESS( + COMMAND lua -e "for k in string.gmatch(package.cpath .. \";\", \"([^;]+)/..so;\") do if k:sub(1,1) == \"/\" then print(k) break end end" + OUTPUT_VARIABLE LUAPATH + RESULT_VARIABLE LUA_CHECK_RES + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + IF(NOT ${LUA_CHECK_RES} EQUAL 0 OR ${LUAPATH} EQUAL "") + MESSAGE(SEND_ERROR "Lua was not found on your system") + ENDIF() ENDIF() ADD_LIBRARY(uci_lua MODULE uci.c)