cmake: add --enable-luajit-static option to enable LuaJit linked statically

diff --git a/cmake/FindLuaJIT.cmake b/cmake/FindLuaJIT.cmake
index 1ad2128363837e271da42a7f776e2d3207d40224..251a258b7ae23b3b99e2eb07d02954841764a41d 100644 (file)
--- 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 cc5600be5d8abc7cfac3f1882e64e58d645c6ca9..6ca9bc9a838ae5fe917d712a05fd6529eb3c5eea 100755 (executable)
--- 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
             ;;