Merge pull request #34 from nicolasvasilache/master

Add rule for static version of libluajit-2.1
torch · Aug 10, 2016 · 411f4b9 · 411f4b9
2 parents 53077f0 + fb5ad98
commit 411f4b9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/luajit-2.1/CMakeLists.txt b/luajit-2.1/CMakeLists.txt
@@ -369,8 +369,12 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} dynasm src)
 
 IF(WITH_AMALG)
   add_library(libluajit SHARED src/ljamalg.c ${DEPS} )
+  add_library(luajit-static STATIC src/ljamalg.c ${DEPS} )
+  set_property(TARGET luajit-static PROPERTY POSITION_INDEPENDENT_CODE 1)
 ELSE()
   add_library(libluajit SHARED ${SRC_LJCORE} ${DEPS} )
+  add_library(luajit-static STATIC ${SRC_LJCORE} ${DEPS} )
+  set_property(TARGET luajit-static PROPERTY POSITION_INDEPENDENT_CODE 1)
 ENDIF()
 
 target_link_libraries (libluajit ${LIBS} )