1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 02:55:12 +00:00

Merge pull request #178 from antonio-malcolm/master

Fix for compiling against toluapp
This commit is contained in:
Brenden Matthews 2015-12-04 10:30:24 -08:00
commit 443ddf54a0

View File

@ -366,11 +366,11 @@ if(WANT_LIBXML2)
endif(WANT_LIBXML2) endif(WANT_LIBXML2)
if(WANT_TOLUA) if(WANT_TOLUA)
find_program(APP_TOLUA NAMES tolua++ tolua++5.1 tolua++-5.1) find_program(APP_TOLUA NAMES toluapp tolua++ tolua++5.1 tolua++-5.1)
if(NOT APP_TOLUA) if(NOT APP_TOLUA)
message(FATAL_ERROR "Unable to find program 'tolua++'") message(FATAL_ERROR "Unable to find program 'tolua++'")
endif(NOT APP_TOLUA) endif(NOT APP_TOLUA)
find_library(TOLUA_LIBS NAMES tolua++ tolua++5.1 tolua++-5.1) find_library(TOLUA_LIBS NAMES toluapp tolua++ tolua++5.1 tolua++-5.1)
find_path(TOLUA_INCLUDE_PATH tolua++.h ${INCLUDE_SEARCH_PATH}) find_path(TOLUA_INCLUDE_PATH tolua++.h ${INCLUDE_SEARCH_PATH})
if(TOLUA_INCLUDE_PATH AND TOLUA_LIBS) if(TOLUA_INCLUDE_PATH AND TOLUA_LIBS)
set(TOLUA_FOUND true) set(TOLUA_FOUND true)