diff options
| author | adrido <robots_only_adrido@gmx.com> | 2019-06-10 03:56:55 +0200 |
|---|---|---|
| committer | rubenwardy <rw@rubenwardy.com> | 2019-06-10 02:56:55 +0100 |
| commit | bd6f1cca9dc357a6dbd54e86b3f575282daf6e1e (patch) | |
| tree | 4f22d7ae58c5a1641fe1601d3e4e67b3c73ad51d /cmake/Modules/FindLuaJIT.cmake | |
| parent | 9a07792f4d79ae5b386b781e6e73377f5758ee6a (diff) | |
| download | minetest-bd6f1cca9dc357a6dbd54e86b3f575282daf6e1e.tar.gz minetest-bd6f1cca9dc357a6dbd54e86b3f575282daf6e1e.tar.bz2 minetest-bd6f1cca9dc357a6dbd54e86b3f575282daf6e1e.zip | |
Add compatibility to vcpkg buildsystem (#8317)
Diffstat (limited to 'cmake/Modules/FindLuaJIT.cmake')
| -rw-r--r-- | cmake/Modules/FindLuaJIT.cmake | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/cmake/Modules/FindLuaJIT.cmake b/cmake/Modules/FindLuaJIT.cmake index cd6e7bdd8..3f5cc1cf4 100644 --- a/cmake/Modules/FindLuaJIT.cmake +++ b/cmake/Modules/FindLuaJIT.cmake @@ -19,19 +19,31 @@ FIND_PATH(LUA_INCLUDE_DIR luajit.h /opt ) -FIND_LIBRARY(LUA_LIBRARY - NAMES luajit-5.1 - HINTS - $ENV{LUA_DIR} - PATH_SUFFIXES lib64 lib - PATHS - ~/Library/Frameworks - /Library/Frameworks - /sw - /opt/local - /opt/csw - /opt -) +# Test if running on vcpkg toolchain +if(DEFINED VCPKG_TARGET_TRIPLET AND DEFINED VCPKG_APPLOCAL_DEPS) + # On vcpkg luajit is 'lua51' and normal lua is 'lua' + FIND_LIBRARY(LUA_LIBRARY + NAMES lua51 + HINTS + $ENV{LUA_DIR} + PATH_SUFFIXES lib + ) +else() + FIND_LIBRARY(LUA_LIBRARY + NAMES luajit-5.1 + HINTS + $ENV{LUA_DIR} + PATH_SUFFIXES lib64 lib + PATHS + ~/Library/Frameworks + /Library/Frameworks + /sw + /opt/local + /opt/csw + /opt + ) +endif() + IF(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/luajit.h") FILE(STRINGS "${LUA_INCLUDE_DIR}/luajit.h" lua_version_str REGEX "^#define[ \t]+LUA_RELEASE[ \t]+\"LuaJIT .+\"") |