|
 |
766cfbc |
From 1b5a6fdbe6a1c9696ec85a9c774a1aea8ccf1672 Mon Sep 17 00:00:00 2001
|
|
|
766cfbc |
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
|
766cfbc |
Date: Tue, 27 Dec 2016 15:23:09 +0100
|
|
|
766cfbc |
Subject: [PATCH] use pkg-config to find luajit
|
|
|
766cfbc |
|
|
|
766cfbc |
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
|
766cfbc |
---
|
|
|
766cfbc |
cmake/Modules/FindLuaJIT.cmake | 38 +++++---------------------------------
|
|
|
766cfbc |
1 file changed, 5 insertions(+), 33 deletions(-)
|
|
|
766cfbc |
|
|
|
766cfbc |
diff --git a/cmake/Modules/FindLuaJIT.cmake b/cmake/Modules/FindLuaJIT.cmake
|
|
|
766cfbc |
index e4335d83..f62fe8ac 100644
|
|
|
766cfbc |
--- a/cmake/Modules/FindLuaJIT.cmake
|
|
|
766cfbc |
+++ b/cmake/Modules/FindLuaJIT.cmake
|
|
|
766cfbc |
@@ -6,39 +6,11 @@
|
|
|
766cfbc |
#
|
|
|
766cfbc |
# This module is similar to FindLua51.cmake except that it finds LuaJit instead.
|
|
|
766cfbc |
|
|
|
766cfbc |
-FIND_PATH(LUA_INCLUDE_DIR luajit.h
|
|
|
766cfbc |
- HINTS
|
|
|
766cfbc |
- $ENV{LUA_DIR}
|
|
|
766cfbc |
- PATH_SUFFIXES include/luajit-2.0 include/luajit-5_1-2.0 include
|
|
|
766cfbc |
- PATHS
|
|
|
766cfbc |
- ~/Library/Frameworks
|
|
|
766cfbc |
- /Library/Frameworks
|
|
|
766cfbc |
- /sw # Fink
|
|
|
766cfbc |
- /opt/local # DarwinPorts
|
|
|
766cfbc |
- /opt/csw # Blastwave
|
|
|
766cfbc |
- /opt
|
|
|
766cfbc |
-)
|
|
|
766cfbc |
-
|
|
|
766cfbc |
-FIND_LIBRARY(LUA_LIBRARY
|
|
|
766cfbc |
- NAMES luajit-5.1
|
|
|
766cfbc |
- HINTS
|
|
|
766cfbc |
- $ENV{LUA_DIR}
|
|
|
766cfbc |
- PATH_SUFFIXES lib64 lib
|
|
|
766cfbc |
- PATHS
|
|
|
766cfbc |
- ~/Library/Frameworks
|
|
|
766cfbc |
- /Library/Frameworks
|
|
|
766cfbc |
- /sw
|
|
|
766cfbc |
- /opt/local
|
|
|
766cfbc |
- /opt/csw
|
|
|
766cfbc |
- /opt
|
|
|
766cfbc |
-)
|
|
|
766cfbc |
-
|
|
|
766cfbc |
-IF(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/luajit.h")
|
|
|
766cfbc |
- FILE(STRINGS "${LUA_INCLUDE_DIR}/luajit.h" lua_version_str REGEX "^#define[ \t]+LUA_RELEASE[ \t]+\"LuaJIT .+\"")
|
|
|
766cfbc |
-
|
|
|
766cfbc |
- STRING(REGEX REPLACE "^#define[ \t]+LUA_RELEASE[ \t]+\"LuaJIT ([^\"]+)\".*" "\\1" LUA_VERSION_STRING "${lua_version_str}")
|
|
|
766cfbc |
- UNSET(lua_version_str)
|
|
|
766cfbc |
-ENDIF()
|
|
|
766cfbc |
+find_package (PkgConfig REQUIRED)
|
|
|
766cfbc |
+pkg_check_modules (LuaJIT QUIET REQUIRED luajit)
|
|
|
766cfbc |
+set (LUA_LIBRARY ${LuaJIT_LIBRARIES})
|
|
|
766cfbc |
+set (LUA_INCLUDE_DIR ${LuaJIT_INCLUDE_DIRS})
|
|
|
766cfbc |
+set (LUA_VERSION_STRING ${LuaJIT_VERSION})
|
|
|
766cfbc |
|
|
|
766cfbc |
INCLUDE(FindPackageHandleStandardArgs)
|
|
|
766cfbc |
# handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE if
|
|
|
766cfbc |
--
|
|
|
766cfbc |
2.11.0
|
|
|
766cfbc |
|