Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Microsoft Windows 8.1 Enterprise, 6.3.9600 Build 9600 Intel(R) Core(TM) i5-2500 CPU @ 3.30GHz, 3301 Mhz, 4 Core(s), 4 Logical Processor(s) Toolchain: Microsoft Visual Studio Community 2015, Version 14.0.25431.01 Update 3 Microsoft (R) C/C++ Optimizing Compiler Version 19.00.24215.1 for x64 Microsoft (R) Incremental Linker Version 14.00.24215.1 ---- set TORCH_INSTALL_PATH=C:/torch git clone https://github.com/torch/luajit-rocks.git cd luajit-rocks git rev-parse HEAD &:: 2c7496b905f6f972673effda4884766433b7583b REM Store the LUAJIT-ROCKS PATCH found at the end of this script in file 'p' git apply p mkdir build cd build cmake .. -DCMAKE_INSTALL_PREFIX=%TORCH_INSTALL_PATH% -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DWITH_LUAJIT21=ON nmake cmake -DCMAKE_INSTALL_PREFIX=%TORCH_INSTALL_PATH% -G "NMake Makefiles" -P cmake_install.cmake -DCMAKE_BUILD_TYPE=Release -DWITH_LUAJIT21=ON ---- LUAJIT-ROCKS PATCH BEGIN ---- diff --git a/luajit-2.1/CMakeLists.txt b/luajit-2.1/CMakeLists.txt index 0df51e9..2637390 100644 --- a/luajit-2.1/CMakeLists.txt +++ b/luajit-2.1/CMakeLists.txt @@ -22,10 +22,10 @@ OPTION(WITH_AMALG "Build eveything in one shot (needs memory)" ON) SET(INSTALL_INCLUDE_SUBDIR "include" CACHE STRING "installation include subdirectory name") IF(WIN32) - SET(INSTALL_BIN_SUBDIR "." CACHE STRING "installation executable subdirectory name") - SET(INSTALL_LIB_SUBDIR "." CACHE STRING "installation library subdirectory name") + SET(INSTALL_BIN_SUBDIR "bin" CACHE STRING "installation executable subdirectory name") + SET(INSTALL_LIB_SUBDIR "lib" CACHE STRING "installation library subdirectory name") SET(INSTALL_LUA_PATH_SUBDIR "lua") # not editable - SET(INSTALL_LUA_CPATH_SUBDIR ".") # not editable + SET(INSTALL_LUA_CPATH_SUBDIR "bin") # not editable ELSE() SET(INSTALL_BIN_SUBDIR "bin" CACHE STRING "installation executable subdirectory name") SET(INSTALL_LIB_SUBDIR "lib" CACHE STRING "installation library subdirectory name") diff --git a/luarocks/CMakeLists.txt b/luarocks/CMakeLists.txt index a77199b..4c4ebed 100644 --- a/luarocks/CMakeLists.txt +++ b/luarocks/CMakeLists.txt @@ -5,10 +5,10 @@ CMAKE_POLICY(VERSION 2.6) SET(INSTALL_INCLUDE_SUBDIR "include" CACHE STRING "installation include subdirectory name") IF(WIN32) - SET(INSTALL_BIN_SUBDIR "." CACHE STRING "installation executable subdirectory name") - SET(INSTALL_LIB_SUBDIR "." CACHE STRING "installation library subdirectory name") + SET(INSTALL_BIN_SUBDIR "bin" CACHE STRING "installation executable subdirectory name") + SET(INSTALL_LIB_SUBDIR "lib" CACHE STRING "installation library subdirectory name") SET(INSTALL_LUA_PATH_SUBDIR "lua") # not editable - SET(INSTALL_LUA_CPATH_SUBDIR ".") # not editable + SET(INSTALL_LUA_CPATH_SUBDIR "bin") # not editable SET(INSTALL_LUAROCKS_ROCKS_SUBDIR "luarocks" CACHE STRING "installation luarocks rocks subdirectory name") SET(INSTALL_LUAROCKS_SYSCONF_SUBDIR "luarocks" CACHE STRING "installation luarocks sysconfig subdirectory name") ELSE() @@ -30,7 +30,7 @@ IF(WIN32) win32/tools/7z.dll win32/tools/libeay32.dll win32/tools/libiconv2.dll win32/tools/libintl3.dll win32/tools/libssl32.dll) - INSTALL(FILES ${WINUTILS_DLL_FILES} DESTINATION "${INSTALL_BIN_SUBDIR}/tools/") + INSTALL(FILES ${WINUTILS_DLL_FILES} DESTINATION "./tools/") SET(WINUTILS_EXE_FILES win32/tools/7z.exe @@ -49,7 +49,7 @@ IF(WIN32) win32/tools/uname.exe win32/tools/wget.exe) - INSTALL(PROGRAMS ${WINUTILS_EXE_FILES} DESTINATION "${INSTALL_BIN_SUBDIR}/tools/") + INSTALL(PROGRAMS ${WINUTILS_EXE_FILES} DESTINATION "./tools/") SET(WGET_EXECUTABLE_NAME "wget") SET(MD5_EXECUTABLE_NAME "md5sum") ---- LUAJIT-ROCKS PATCH END ---- Build configuration: -- The C compiler identification is MSVC 19.0.24215.1 -- The CXX compiler identification is MSVC 19.0.24215.1 -- Check for working C compiler: C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/amd64/cl.exe -- Check for working C compiler: C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/amd64/cl.exe -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working CXX compiler: C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/amd64/cl.exe -- Check for working CXX compiler: C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/amd64/cl.exe -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Detecting CXX compile features -- Detecting CXX compile features - done -- The ASM compiler identification is MSVC -- Found assembler: C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/amd64/cl.exe -- Warning: Did not find file Compiler/MSVC-ASM -- Looking for sys/types.h -- Looking for sys/types.h - found -- Looking for stdint.h -- Looking for stdint.h - found -- Looking for stddef.h -- Looking for stddef.h - found -- Check size of void* -- Check size of void* - done -- Looking for sin in m -- Looking for sin in m - not found -- Looking for printw in ncurses -- Looking for printw in ncurses - not found -- Looking for pthread.h -- Looking for pthread.h - not found -- Found Threads: TRUE -- Performing Test LJ_TARGET_X64 -- Performing Test LJ_TARGET_X64 - Success -- LuaJIT Target: x64 -- Performing Test LJ_LE_1 -- Performing Test LJ_LE_1 - Success -- Performing Test LJ_ARCH_BITS_64 -- Performing Test LJ_ARCH_BITS_64 - Success -- Performing Test LJ_HASJIT_1 -- Performing Test LJ_HASJIT_1 - Success -- Performing Test LJ_HASFFI_1 -- Performing Test LJ_HASFFI_1 - Success -- Performing Test LJ_DUALNUM_1 -- Performing Test LJ_DUALNUM_1 - Failed -- Performing Test LJ_ARCH_HASFPU_1 -- Performing Test LJ_ARCH_HASFPU_1 - Success -- Performing Test LJ_ABI_SOFTFP_1 -- Performing Test LJ_ABI_SOFTFP_1 - Failed -- Performing Test LJ_NO_UNWIND_1 -- Performing Test LJ_NO_UNWIND_1 - Failed -- Performing Test LJ_FR2_1 -- Performing Test LJ_FR2_1 - Success -- Looking for sin in m -- Looking for sin in m - not found
- Loading branch information