From ef599435aeaf9dd0027b844354187c514b6a3e37 Mon Sep 17 00:00:00 2001 From: "Steven Baigal (sbaigal)" Date: Wed, 3 Aug 2022 14:27:14 -0400 Subject: [PATCH] cmake: add --enable-luajit-static option to enable LuaJit linked statically --- cmake/FindLuaJIT.cmake | 7 ++++++- configure_cmake.sh | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cmake/FindLuaJIT.cmake b/cmake/FindLuaJIT.cmake index 1ad212836..251a258b7 100644 --- a/cmake/FindLuaJIT.cmake +++ b/cmake/FindLuaJIT.cmake @@ -19,8 +19,13 @@ pkg_check_modules(PC_LUAJIT luajit) # and then package config information after that. find_path(LUAJIT_INCLUDE_DIR luajit.h HINTS ${LUAJIT_INCLUDE_DIR_HINT} ${PC_LUAJIT_INCLUDEDIR} ${PC_LUAJIT_INCLUDE_DIRS}) -find_library(LUAJIT_LIBRARIES NAMES luajit-5.1 +if (STATIC_LUAJIT) + find_library(LUAJIT_LIBRARIES NAMES libluajit-5.1.a HINTS ${LUAJIT_LIBRARIES_DIR_HINT} ${PC_LUAJIT_LIBDIR} ${PC_LUAJIT_LIBRARY_DIRS}) +else() + find_library(LUAJIT_LIBRARIES NAMES luajit-5.1 + HINTS ${LUAJIT_LIBRARIES_DIR_HINT} ${PC_LUAJIT_LIBDIR} ${PC_LUAJIT_LIBRARY_DIRS}) +endif() if (APPLE) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LUAJIT_LIBRARIES} -pagezero_size 10000 -image_base 100000000") diff --git a/configure_cmake.sh b/configure_cmake.sh index cc5600be5..6ca9bc9a8 100755 --- a/configure_cmake.sh +++ b/configure_cmake.sh @@ -70,6 +70,7 @@ Optional Features: --enable-jemalloc enable using jemalloc for dynamic memory management --enable-jemalloc-static same as --enable-jemalloc but linked statically + --enable-luajit-static enable luajit linked statically --enable-appid-third-party enable third party appid --enable-unit-tests build unit tests @@ -339,6 +340,9 @@ while [ $# -ne 0 ]; do append_cache_entry ENABLE_JEMALLOC BOOL true append_cache_entry STATIC_JEMALLOC BOOL true ;; + --enable-luajit-static) + append_cache_entry STATIC_LUAJIT BOOL true + ;; --disable-jemalloc-static) append_cache_entry ENABLE_JEMALLOC BOOL false ;; -- 2.47.3