diff --git a/cmake/FindLuaJIT.cmake b/cmake/FindLuaJIT.cmake --- a/cmake/FindLuaJIT.cmake +++ b/cmake/FindLuaJIT.cmake @@ -1,14 +1,13 @@ -SET (LuaJIT_FOUND FALSE) -SET (LUAJIT_LIBRARY_NAME luajit-5.1) -SET (LUAJIT_INCLUDE_DIRS /usr/include/luajit-2.0 /usr/local/include/luajit-2.0) +find_package(PkgConfig) -FIND_PATH (LUAJIT_INCLUDE_DIR lua.h ${LUAJIT_INCLUDE_DIRS} ) -FIND_LIBRARY (LUAJIT_LIBRARY NAMES ${LUAJIT_LIBRARY_NAME} PATHS ${CMAKE_LIBRARY_PATH}) +pkg_check_modules(LUAJIT QUIET luajit) -IF (LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARY) - SET (LuaJIT_FOUND TRUE) -ENDIF (LUAJIT_INCLUDE_DIR AND LUAJIT_LIBRARY) +find_path(LUAJIT_INCLUDE_DIR lua.hpp HINTS ${LUAJIT_INCLUDEDIR} ${LUAJIT_INCLUDE_DIRS}) +find_library(LUAJIT_LIBRARY NAMES luajit-5.1 luajit HINTS ${LUAJIT_LIBDIR} ${LUAJIT_LIBRARY_DIRS}) -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJIT DEFAULT_MSG LUAJIT_LIBRARY LUAJIT_INCLUDE_DIR) -MARK_AS_ADVANCED ( LUAJIT_INCLUDE_DIR LUAJIT_LIBRARY) +set(LUAJIT_LIBRARIES ${LUAJIT_LIBRARY}) +set(LUAJIT_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIR}) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(LuaJIT DEFAULT_MSG LUAJIT_LIBRARY LUAJIT_INCLUDE_DIR) +mark_as_advanced(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARY) diff --git a/src/backends/lua/luaexpression.cpp b/src/backends/lua/luaexpression.cpp --- a/src/backends/lua/luaexpression.cpp +++ b/src/backends/lua/luaexpression.cpp @@ -26,7 +26,7 @@ #include "imageresult.h" #include "helpresult.h" -#include // need the luajit-2.0 prefix to avoid conflicts with Lua 5.2 +#include #include #include diff --git a/src/backends/lua/luahelper.cpp b/src/backends/lua/luahelper.cpp --- a/src/backends/lua/luahelper.cpp +++ b/src/backends/lua/luahelper.cpp @@ -20,7 +20,7 @@ #include "luahelper.h" -#include // need the luajit-2.0 prefix to avoid conflicts with Lua 5.2 +#include #include #include diff --git a/src/backends/lua/luasession.h b/src/backends/lua/luasession.h --- a/src/backends/lua/luasession.h +++ b/src/backends/lua/luasession.h @@ -22,7 +22,7 @@ #define _LUASESSION_H #include "session.h" -#include // need the luajit-2.0 prefix to avoid conflicts with Lua 5.2 +#include class LuaExpression;