1 files changed, 7 insertions, 7 deletions

diff --git a/src/luarocks/build/cmake.lua b/src/luarocks/build/cmake.lua
index a1c08dfa..3d0f22a2 100644
--- a/src/luarocks/build/cmake.lua
+++ b/src/luarocks/build/cmake.lua
@@ -37,16 +37,16 @@ function cmake.run(rockspec)
 
    -- Execute cmake with variables.
    local args = ""
-   if cfg.cmake_generator then
+   
+   -- Try to pick the best generator. With msvc and x64, CMake does not select it by default so we need to be explicit.
+   if cfg.is_platform("mingw32") and cfg.cmake_generator then
       args = args .. ' -G"'..cfg.cmake_generator.. '"'
-   end
-   for k,v in pairs(variables) do
-      args = args .. ' -D' ..k.. '="' ..v.. '"'
+   elseif cfg.is_platform("windows") and cfg.arch:match("%-x86_64$") then
+      args = args .. " -DCMAKE_GENERATOR_PLATFORM=x64"
    end
 
-   -- Generate 64 bit build if appropiate.
-   if not not cfg.arch:match("%-x86_64$") then
-      args = args .. " -DCMAKE_GENERATOR_PLATFORM=x64"
+   for k,v in pairs(variables) do
+      args = args .. ' -D' ..k.. '="' ..tostring(v).. '"'
    end
 
    if not fs.execute_string(rockspec.variables.CMAKE.." -H. -Bbuild.luarocks "..args) then