From b9789f31d51a1bd07b5d629d36d3943c26bd9892 Mon Sep 17 00:00:00 2001 From: Xpol Wan Date: Thu, 26 Mar 2015 12:22:12 +0800 Subject: Revert incorrect remove of cmake_generator support. Only windows (msvc) default cmake_generator are removed. --- src/luarocks/build/cmake.lua | 3 +++ src/luarocks/cfg.lua | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/luarocks/build/cmake.lua b/src/luarocks/build/cmake.lua index 0ee125a3..e5b29147 100644 --- a/src/luarocks/build/cmake.lua +++ b/src/luarocks/build/cmake.lua @@ -37,6 +37,9 @@ function cmake.run(rockspec) -- Execute cmake with variables. local args = "" + if cfg.cmake_generator then + args = args .. ' -G"'..cfg.cmake_generator.. '"' + end for k,v in pairs(variables) do args = args .. ' -D' ..k.. '="' ..v.. '"' end diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 45dbdd1b..f806f822 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua @@ -371,6 +371,7 @@ end if detected.mingw32 then defaults.platforms = { "win32", "mingw32", "windows" } defaults.obj_extension = "o" + defaults.cmake_generator = "MinGW Makefiles" defaults.variables.MAKE = "mingw32-make" defaults.variables.CC = "mingw32-gcc" defaults.variables.RC = "windres" @@ -401,6 +402,7 @@ if detected.unix then defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR or "/usr/local/include" defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR or "/usr/local/lib" defaults.variables.CFLAGS = "-O2" + defaults.cmake_generator = "Unix Makefiles" defaults.platforms = { "unix" } defaults.variables.CC = "gcc" defaults.variables.LD = "gcc" @@ -432,6 +434,7 @@ if detected.cygwin then defaults.lib_extension = "so" -- can be overridden in the config file for mingw builds defaults.arch = "cygwin-"..proc defaults.platforms = {"unix", "cygwin"} + defaults.cmake_generator = "Unix Makefiles" defaults.variables.CC = "echo -llua | xargs gcc" defaults.variables.LD = "echo -llua | xargs gcc" defaults.variables.LIBFLAG = "-shared" -- cgit v1.2.3-55-g6feb