From ca005b498b89ce3ce0af5dd5f1b7eaf27032b266 Mon Sep 17 00:00:00 2001 From: Matthew Budd Date: Sat, 28 Nov 2020 23:28:35 -0500 Subject: [PATCH] Bug fix for cmake pkg-config search for lua 5.1 package. Ubuntu packages this as lua5.1 and Fedora names it lua-5.1. Changed cmake file to use pkg_search_module to search for both package names and use the first one it finds. --- src/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 82db5765..cbeded37 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -85,10 +85,12 @@ else(WIN32) endif() # Check for LUA - pkg_check_modules( LUA lua-5.1) + pkg_search_module( LUA lua5.1 lua-5.1 ) if ( ${LUA_FOUND} ) # Use System LUA + message( STATUS "Using System Lua ${LUA_VERSION}" ) + add_definitions( -D_S9XLUA_H ${LUA_CFLAGS} ) set( LUA_ENGINE_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/lua-engine.cpp ) @@ -96,6 +98,8 @@ else(WIN32) else () # Use Internal LUA + message( STATUS "Using Internal Lua" ) + add_definitions( -D_S9XLUA_H -I${CMAKE_CURRENT_SOURCE_DIR}/lua/src ) set( LUA_ENGINE_SOURCE