From 6f872b0e178dcf23646bdbf0751541bbe05c8d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Sat, 4 May 2013 23:06:15 +0000 Subject: [PATCH] Attempted fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8619 When there are several versions of lua installed, try to pick the library version that matches the include file(s) we selected. svn path=/trunk/; revision=49164 --- cmake/modules/FindLUA.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/modules/FindLUA.cmake b/cmake/modules/FindLUA.cmake index e490fc105f..4c5577e9ea 100644 --- a/cmake/modules/FindLUA.cmake +++ b/cmake/modules/FindLUA.cmake @@ -38,10 +38,15 @@ if(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h") set( LUA_VERSION "500") endif() endif() +string( REGEX REPLACE ".*[/\\]lua(.+)$" "\\1" LUA_INC_SUFFIX "${LUA_INCLUDE_DIR}" ) +if ( LUA_INCLUDE_DIR STREQUAL LUA_INC_SUFFIX ) + set( LUA_INC_SUFFIX "") +endif() +message("LUA INCLUDE SUFFIX: ${LUA_INC_SUFFIX}") FIND_LIBRARY(LUA_LIBRARY - NAMES lua52 lua5.2 lua51 lua5.1 lua + NAMES lua${LUA_INC_SUFFIX} lua52 lua5.2 lua51 lua5.1 lua HINTS $ENV{LUA_DIR} PATH_SUFFIXES lib64 lib