[OpenWrt-Devel] [PATCH] projects/uci: lua: use built in pkg-config support for alternatives

Karl Palsson karlp at tweak.net.au
Fri Apr 15 11:12:18 EDT 2016


From: Karl Palsson <karlp at remake.is>

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 <karlp at remake.is>
---

This is the same as https://patchwork.ozlabs.org/patch/507965/ but for "uci"
 instead of libubox.
This fixes compiling and basic usage on fedora23 with compat-lua-devel

 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.4.11
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


More information about the openwrt-devel mailing list