X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=lua%2FCMakeLists.txt;h=b9f513a9c044464b792f28471fd0d278f47d5d25;hp=e4295d7d452b1c4b129587288f335d28bf2faa0f;hb=e1bf4356e1b513e158e1b5049147087ed6342cfd;hpb=2e90d2637abcbea12f5f4070be7a158fb4637604 diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt index e4295d7..b9f513a 100644 --- a/lua/CMakeLists.txt +++ b/lua/CMakeLists.txt @@ -5,14 +5,8 @@ PROJECT(uci C) SET(CMAKE_INSTALL_PREFIX /) IF(NOT LUA_CFLAGS) - FIND_PROGRAM(PKG_CONFIG pkg-config) - IF(PKG_CONFIG) - EXECUTE_PROCESS( - COMMAND pkg-config --silence-errors --cflags lua5.1 - OUTPUT_VARIABLE LUA_CFLAGS - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - ENDIF() + INCLUDE(FindPkgConfig) + pkg_search_module(LUA lua5.1 lua-5.1) ENDIF() ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -I.. ${LUA_CFLAGS}) @@ -36,7 +30,7 @@ IF(NOT LUAPATH) ) IF(BUILD_LUA) - IF(NOT ${LUA_CHECK_RES} EQUAL 0 OR ${LUAPATH} EQUAL "") + IF(NOT ${LUA_CHECK_RES} EQUAL 0 OR "${LUAPATH}" EQUAL "") MESSAGE(SEND_ERROR "Lua was not found on your system") ENDIF() ENDIF()