From e1bf4356e1b513e158e1b5049147087ed6342cfd Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Fri, 15 Apr 2016 15:12:18 +0000 Subject: [PATCH] projects/uci: lua: use built in pkg-config support 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 | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt index 4ba8e37..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}) -- 2.11.0