Merge pull request torch#245 from zakattacktwitter/ztaylor/static_lib

Adding support for a static build of torch.
yaolubrain · May 27, 2015 · 0656455 · 0656455
2 parents 4af3663 + 9f3f709
commit 0656455
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/cmake/TorchPackage.cmake b/cmake/TorchPackage.cmake
@@ -8,7 +8,8 @@ MACRO(ADD_TORCH_PACKAGE package src luasrc)
   IF(src)      
 
     ADD_LIBRARY(${package} MODULE ${src})
-
+    ADD_LIBRARY(${package}_static STATIC ${src})
+
     ### Torch packages supposes libraries prefix is "lib"
     SET_TARGET_PROPERTIES(${package} PROPERTIES
       PREFIX "lib"

diff --git a/lib/TH/CMakeLists.txt b/lib/TH/CMakeLists.txt
@@ -103,6 +103,7 @@ SET(src
 
 SET(src ${src} ${hdr})
 ADD_LIBRARY(TH SHARED ${src})
+ADD_LIBRARY(TH_static STATIC ${src})
 
 CHECK_C_SOURCE_RUNS("
 #include <stdatomic.h>

diff --git a/lib/luaT/CMakeLists.txt b/lib/luaT/CMakeLists.txt
@@ -9,6 +9,7 @@ IF(LUALIB)
 ENDIF()
 
 ADD_LIBRARY(luaT SHARED luaT.h luaT.c)
+ADD_LIBRARY(luaT_static STATIC luaT.h luaT.c)
 
 IF(APPLE)
   SET_TARGET_PROPERTIES(luaT PROPERTIES

diff --git a/rocks/torch-scm-1.rockspec b/rocks/torch-scm-1.rockspec
@@ -22,7 +22,7 @@ dependencies = {
 build = {
    type = "command",
    build_command = [[
-cmake -E make_directory build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release -DLUA=$(LUA) -DLUALIB=$(LUALIB) -DLUA_BINDIR="$(LUA_BINDIR)" -DLUA_INCDIR="$(LUA_INCDIR)" -DLUA_LIBDIR="$(LUA_LIBDIR)" -DLUADIR="$(LUADIR)" -DLIBDIR="$(LIBDIR)" -DCMAKE_INSTALL_PREFIX="$(PREFIX)" && $(MAKE)
+cmake -E make_directory build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release -DLUA=$(LUA) -DLUALIB=$(LUALIB) -DLUA_BINDIR="$(LUA_BINDIR)" -DLUA_INCDIR="$(LUA_INCDIR)" -DLUA_LIBDIR="$(LUA_LIBDIR)" -DLUADIR="$(LUADIR)" -DLIBDIR="$(LIBDIR)" -DCMAKE_INSTALL_PREFIX="$(PREFIX)" -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC && $(MAKE)
 ]],
    install_command = "cd build && $(MAKE) install"
 }