From 682e071ef71f52125793aabb9e060343ea481443 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Thu, 24 Sep 2015 15:14:04 +0000 Subject: [PATCH] libubox: lua: use pkg-config built in module to search for alternatives Different distributions have different names for the lua 5.1 package. Use cmake's built in pkg-config support to search for the first one, rather than running it explicitly and searching for a single version. Signed-off-by: Karl Palsson --- lua/CMakeLists.txt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt index 10c6dc1..34c9ab1 100644 --- a/lua/CMakeLists.txt +++ b/lua/CMakeLists.txt @@ -5,14 +5,7 @@ PROJECT(uloop 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() + pkg_search_module(LUA lua5.1 lua-5.1) ENDIF() ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -I.. ${LUA_CFLAGS}) -- 2.25.1