From 761f05c2b4725732b78d172ef94c8e85d3a67e56 Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Thu, 16 Feb 2023 21:40:08 -0500 Subject: [PATCH] Also replace this. --- 3rdparty/toluapp/CMakeLists.txt | 3 +-- cmake/ConkyPlatformChecks.cmake | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/3rdparty/toluapp/CMakeLists.txt b/3rdparty/toluapp/CMakeLists.txt index 0c0fc264..2d79e75c 100644 --- a/3rdparty/toluapp/CMakeLists.txt +++ b/3rdparty/toluapp/CMakeLists.txt @@ -10,8 +10,7 @@ cmake_minimum_required ( VERSION 3.4 ) # include ( cmake/dist.cmake ) include(FindPkgConfig) - -pkg_search_module(LUA REQUIRED lua>=5.3 lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52) +include(FindLua) include_directories ( include src/lib ${LUA_INCLUDE_DIR} ) # Build lib diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake index 8d489737..3b1534f0 100644 --- a/cmake/ConkyPlatformChecks.cmake +++ b/cmake/ConkyPlatformChecks.cmake @@ -393,7 +393,6 @@ include(FindLua) set(conky_libs ${conky_libs} ${LUA_LIBRARIES}) set(conky_includes ${conky_includes} ${LUA_INCLUDE_DIR}) -link_directories(${LUA_LIBRARY_DIRS}) include_directories(3rdparty/toluapp/include) if(BUILD_X11)