--- cmake/FindLua.cmake.orig 2010-12-10 15:13:27.000000000 +0000 +++ cmake/FindLua.cmake 2010-12-12 04:00:45.000000000 +0000 @@ -33,51 +33,24 @@ SET(LUA_FIND_QUIETLY TRUE) ENDIF(LUA_FOUND) -FIND_PATH( - LUA51_INCLUDE_PATH lua.h - PATHS /usr/include /usr/local/include /usr/pkg/include - PATH_SUFFIXES lua51 lua5.1 lua-5.1 +FIND_PATH(LUA_INCLUDE_PATH lua.h + PATHS ${BSD_LUA_INCDIR} ) -FIND_LIBRARY( - LUA51_LIBRARY NAMES lua51 lua5.1 lua-5.1 lua - PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib - PATH_SUFFIXES lua51 lua5.1 lua-5.1 +FIND_LIBRARY(LUA_LIBRARY + NAMES lua + PATHS ${BSD_LUA_LIBDIR} ) -IF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY) - SET(LUA_INCLUDE_PATH "${LUA51_INCLUDE_PATH}") - SET(LUA_LIBRARY "${LUA51_LIBRARY}") - SET(LUA_VERSION "5.1") - SET(LUA_FOUND TRUE) -ELSE(LUA51_INCLUDE_PATH AND LUA51_LIBRARY) - FIND_PATH( - LUA50_INCLUDE_PATH lua.h - PATHS /usr/include /usr/local/include /usr/pkg/include - PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua - ) - - FIND_LIBRARY( - LUA50_LIBRARY NAMES lua50 lua5.0 lua-5.0 lua - PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib - PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua - ) - - FIND_LIBRARY( - LUALIB50_LIBRARY NAMES lualib50 lualib5.0 lualib-5.0 lualib - PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib - PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua - ) - - IF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY) - SET(LUA_INCLUDE_PATH "${LUA50_INCLUDE_PATH}") - SET(LUA_LIBRARY "${LUA50_LIBRARY}") - SET(LUALIB_LIBRARY "${LUALIB50_LIBRARY}") - SET(LUA_VERSION "5.0") - SET(LUA_FOUND TRUE) - ENDIF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY) -ENDIF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY) +SET(LUA_VERSION ${BSD_LUA_VER}) + +IF(LUA_VERSION STREQUAL "5.0") + SET(LUALIB_LIBRARY ${LUA_LIBRARY}) +ENDIF(LUA_VERSION STREQUAL "5.0") +IF(LUA_INCLUDE_PATH AND LUA_LIBRARY) + SET(LUA_FOUND TRUE) +ENDIF(LUA_INCLUDE_PATH AND LUA_LIBRARY) MARK_AS_ADVANCED( LUA_INCLUDE_PATH