diff options
| author | Boris Fomitchev <bfomitchev@nvidia.com> | 2016-07-10 05:15:23 +0300 |
|---|---|---|
| committer | Boris Fomitchev <bfomitchev@nvidia.com> | 2016-07-10 05:15:23 +0300 |
| commit | 0128e9ef7f450f32d9196cf3670a747ce0c10fd2 (patch) | |
| tree | 64aeb6bf534b251b78681afa5c408dc023a18818 /CMakeLists.txt | |
| parent | f95379d8512ab96939b0d797c489bbaedf7fa313 (diff) | |
Fixes for Android
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cc18174..31884a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,10 @@ IF (WITH_LUAROCKS STREQUAL OFF) SET(LUA_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib) MESSAGE(STATUS "LUA_LIBDIR: ${LUA_LIBDIR}") ENDIF(NOT DEFINED ${LUA_LIBDIR}) + IF (NOT DEFINED ${LUA_BINDIR}) + SET(LUA_BINDIR ${CMAKE_INSTALL_PREFIX}/bin) + MESSAGE(STATUS "LUA_BINDIR: ${LUA_BINDIR}") + ENDIF(NOT DEFINED ${LUA_BINDIR}) IF (NOT DEFINED ${LUALIB}) IF (WITH_LUAJIT21 OR WITH_LUAJIT20) SET(LUALIB ${LIBRARY_OUTPUT_PATH}/libluajit.so) @@ -38,34 +42,37 @@ IF (WITH_LUAROCKS STREQUAL OFF) SET(LUA_BINDIR ${CMAKE_INSTALL_PREFIX}/bin) MESSAGE(STATUS "LUA_BINDIR: ${LUA_BINDIR}") ENDIF(NOT DEFINED ${LUA_BINDIR}) + IF (NOT DEFINED ${SCRIPTS_DIR}) + SET(SCRIPTS_DIR ${CMAKE_INSTALL_PREFIX}/bin) + MESSAGE(STATUS "SCRIPTS_DIR: ${SCRIPTS_DIR}") + ENDIF(NOT DEFINED ${SCRIPTS_DIR}) - # add torch defs - # this is done to fake compliance with FIND_PACKAGE(Torch) - SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" - "${CMAKE_CURRENT_BINARY_DIR}/cmake" "${CMAKE_MODULE_PATH}") - - # These are needed variables for all the ADD_TORCH_PACKAGE macros INCLUDE_DIRECTORIES(${LUA_INCDIR}) IF (WITH_LUAJIT21 OR WITH_LUAJIT20) INCLUDE_DIRECTORIES(${LuaJIT_SOURCE_DIR}/src ${LuaJIT_BINARY_DIR}) + SET(LUA "luajit") ELSE (WITH_LUAJIT21 OR WITH_LUAJIT20) INCLUDE_DIRECTORIES(${Lua_SOURCE_DIR}/src ${Lua_BINARY_DIR}) - ENDIF (WITH_LUAJIT21 OR WITH_LUAJIT20) + SET(LUA "lua") + ENDIF (WITH_LUAJIT21 OR WITH_LUAJIT20) + + # add torch defs + # this is done to fake compliance with FIND_PACKAGE(Torch) + SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" + "${CMAKE_CURRENT_BINARY_DIR}/cmake" "${CMAKE_MODULE_PATH}") + INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/pkg/torch/lib/TH") INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/pkg/torch/lib/TH") INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/pkg/torch/lib/luaT") INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/pkg/torch/lib/luaT") + + SET(Torch_INSTALL_INCLUDE_SUBDIR ${LUA_INCDIR}) + SET(Torch_INSTALL_INCLUDE ${LUA_INCDIR}) SET(Torch_INSTALL_LUA_PATH_SUBDIR ${LUADIR}) SET(Torch_INSTALL_LUA_CPATH_SUBDIR ${LIBDIR}) SET(Torch_INSTALL_LIB ${LUA_LIBDIR}) SET(Torch_INSTALL_LIB_SUBDIR ${LUA_LIBDIR}) - # Set up variables to find THC - IF (WITH_CUDA STREQUAL ON) - SET(THC_SOURCE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/extra/cutorch/lib") - SET(THC_BINARY_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/extra/cutorch/lib") - ENDIF(WITH_CUDA STREQUAL ON) - # Finally add the two directories ADD_SUBDIRECTORY(pkg) ADD_SUBDIRECTORY(extra) |