diff options
| author | Ronan Collobert <ronan@collobert.com> | 2013-10-26 21:51:51 +0400 |
|---|---|---|
| committer | Ronan Collobert <ronan@collobert.com> | 2013-10-26 21:51:51 +0400 |
| commit | c99616eee17a1dec3421f985359100ea63da874c (patch) | |
| tree | 39a98956c7f521e703bdfba05bc218bea790476c | |
| parent | 5c473164d2f3842f262245e7db7c32c44e51a325 (diff) | |
| parent | 0599e578f8c23c0e5351168c879fc421b59ae873 (diff) | |
Merge branch 'master' of github.com:torch/luajit-rocks
Conflicts:
luajit/CMakeLists.txt
| -rw-r--r-- | luajit/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | luarocks/CMakeLists.txt | 23 |
2 files changed, 33 insertions, 12 deletions
diff --git a/luajit/CMakeLists.txt b/luajit/CMakeLists.txt index c2e5486..392f22d 100644 --- a/luajit/CMakeLists.txt +++ b/luajit/CMakeLists.txt @@ -11,12 +11,19 @@ CMAKE_POLICY(VERSION 2.6) OPTION(WITH_AMALG "Build eveything in one shot (needs memory)" ON) -SET(INSTALL_BIN_SUBDIR "bin" CACHE STRING "installation executable subdirectory name") -SET(INSTALL_LIB_SUBDIR "lib" CACHE STRING "installation library subdirectory name") SET(INSTALL_INCLUDE_SUBDIR "include" CACHE STRING "installation include subdirectory name") -SET(INSTALL_LUA_PATH_SUBDIR "share/lua/5.1") # not editable -SET(INSTALL_LUA_LIB_SUBDIR "lib" CACHE STRING "installation lua lib subdirectory name") -SET(INSTALL_LUA_CPATH_SUBDIR "${INSTALL_LUA_LIB_SUBDIR}/lua/5.1") # not editable +IF(WIN32) + SET(INSTALL_BIN_SUBDIR "." CACHE STRING "installation executable subdirectory name") + SET(INSTALL_LIB_SUBDIR "." CACHE STRING "installation library subdirectory name") + SET(INSTALL_LUA_PATH_SUBDIR "lua") # not editable + SET(INSTALL_LUA_CPATH_SUBDIR ".") # 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") + SET(INSTALL_LUA_PATH_SUBDIR "share/lua/5.1") # not editable + SET(INSTALL_LUA_LIB_SUBDIR "lib" CACHE STRING "installation lua lib subdirectory name") + SET(INSTALL_LUA_CPATH_SUBDIR "${INSTALL_LUA_LIB_SUBDIR}/lua/5.1") # not editable +ENDIF() ADD_DEFINITIONS(-DLUA_MULTILIB="${INSTALL_LUA_LIB_SUBDIR}") @@ -26,6 +33,11 @@ IF(UNIX) ENDIF() ENDIF() +# Ugly warnings +IF(MSVC) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) +ENDIF() + # Various includes INCLUDE(CheckLibraryExists) INCLUDE(CheckFunctionExists) diff --git a/luarocks/CMakeLists.txt b/luarocks/CMakeLists.txt index 9139b78..e492c7a 100644 --- a/luarocks/CMakeLists.txt +++ b/luarocks/CMakeLists.txt @@ -3,14 +3,23 @@ project(luarocks) CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR) CMAKE_POLICY(VERSION 2.6) -SET(INSTALL_BIN_SUBDIR "bin" CACHE STRING "installation executable subdirectory name") -SET(INSTALL_LIB_SUBDIR "lib" CACHE STRING "installation library subdirectory name") SET(INSTALL_INCLUDE_SUBDIR "include" CACHE STRING "installation include subdirectory name") -SET(INSTALL_LUA_PATH_SUBDIR "share/lua/5.1") # not editable -SET(INSTALL_LUA_LIB_SUBDIR "lib" CACHE STRING "installation lua lib subdirectory name") -SET(INSTALL_LUA_CPATH_SUBDIR "${INSTALL_LUA_LIB_SUBDIR}/lua/5.1") # not editable -SET(INSTALL_LUAROCKS_ROCKS_SUBDIR "lib/luarocks/rocks" CACHE STRING "installation luarocks rocks subdirectory name") -SET(INSTALL_LUAROCKS_SYSCONF_SUBDIR "etc/luarocks" CACHE STRING "installation luarocks sysconfig 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_LUA_PATH_SUBDIR "lua") # not editable + SET(INSTALL_LUA_CPATH_SUBDIR ".") # 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() + 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 "share/lua/5.1") # not editable + SET(INSTALL_LUA_LIB_SUBDIR "lib" CACHE STRING "installation lua lib subdirectory name") + SET(INSTALL_LUA_CPATH_SUBDIR "${INSTALL_LUA_LIB_SUBDIR}/lua/5.1") # not editable + SET(INSTALL_LUAROCKS_ROCKS_SUBDIR "lib/luarocks/rocks" CACHE STRING "installation luarocks rocks subdirectory name") + SET(INSTALL_LUAROCKS_SYSCONF_SUBDIR "etc/luarocks" CACHE STRING "installation luarocks sysconfig subdirectory name") +ENDIF() SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}") |