diff options
| author | Luke Alonso <lalonso@twitter.com> | 2017-03-01 02:58:39 +0300 |
|---|---|---|
| committer | Pavan Yalamanchili <pyalamanchili@twitter.com> | 2017-05-26 01:41:52 +0300 |
| commit | 2ed44b99915b0b31b5535df9174153e991f1a6e8 (patch) | |
| tree | 3d73ed9e1e12c56ae18b1889b563745ad32c31cd /lib | |
| parent | edb89bf66fe6a2c511d735ac77fd89e39931bec3 (diff) | |
Adding support for ADD_TORCH_LIBRARY macro
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/TH/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | lib/luaT/CMakeLists.txt | 11 |
2 files changed, 17 insertions, 8 deletions
diff --git a/lib/TH/CMakeLists.txt b/lib/TH/CMakeLists.txt index c4e6694..b481a8a 100644 --- a/lib/TH/CMakeLists.txt +++ b/lib/TH/CMakeLists.txt @@ -145,7 +145,6 @@ IF(C_AVX2_FOUND) SET(CMAKE_C_FLAGS "-DUSE_AVX2 ${CMAKE_C_FLAGS}") ENDIF(C_AVX2_FOUND) - CHECK_C_SOURCE_RUNS(" #include <stdatomic.h> int main() @@ -243,10 +242,15 @@ SET(src ${src} ${hdr} ${simd}) ##### build section ###################################################################### -ADD_LIBRARY(TH SHARED ${src}) -if(BUILD_STATIC) - ADD_LIBRARY(TH_static STATIC ${src}) -endif() +ADD_TORCH_LIBRARY(TH SHARED "${src}") + +IF (BUILD_STATIC OR "$ENV{STATIC_TH}" STREQUAL "YES") + ADD_TORCH_LIBRARY(TH_static STATIC "${src}") + SET_TARGET_PROPERTIES(TH_static PROPERTIES + COMPILE_FLAGS "-fPIC") + SET_TARGET_PROPERTIES(TH_static PROPERTIES + PREFIX "lib" IMPORT_PREFIX "lib" OUTPUT_NAME "TH") +ENDIF() IF(NOT TH_SO_VERSION) SET(TH_SO_VERSION 0) diff --git a/lib/luaT/CMakeLists.txt b/lib/luaT/CMakeLists.txt index f33768c..072991c 100644 --- a/lib/luaT/CMakeLists.txt +++ b/lib/luaT/CMakeLists.txt @@ -9,9 +9,14 @@ IF(LUALIB) ENDIF() ADD_LIBRARY(luaT SHARED luaT.h luaT.c) -if(BUILD_STATIC) + +IF (BUILD_STATIC OR "$ENV{STATIC_TH}" STREQUAL "YES") ADD_LIBRARY(luaT_static STATIC luaT.h luaT.c) -endif() + SET_TARGET_PROPERTIES(luaT_static PROPERTIES + COMPILE_FLAGS "-fPIC") + SET_TARGET_PROPERTIES(luaT_static PROPERTIES + PREFIX "lib" IMPORT_PREFIX "lib" OUTPUT_NAME "luaT") +ENDIF() SET_TARGET_PROPERTIES(luaT PROPERTIES VERSION 0 @@ -41,5 +46,5 @@ GET_FILENAME_COMPONENT(LUAT_OUTPUT_NAME ${LUAT_OUTPUT_NAME} NAME) SET(LUAT_LIBRARIES "${Torch_INSTALL_LIB}/${LUAT_OUTPUT_NAME}") SET(LUAT_INCLUDE_DIR "${Torch_INSTALL_INCLUDE}") CONFIGURE_FILE(luaTConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/cmake-exports/luaTConfig.cmake") -INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake-exports/luaTConfig.cmake" +INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake-exports/luaTConfig.cmake" DESTINATION "${Torch_INSTALL_CMAKE_SUBDIR}") |