diff options
| author | Ignacio Burgueño <ignaciob@inconcertcc.com> | 2015-06-25 11:22:34 -0300 |
|---|---|---|
| committer | Ignacio Burgueño <ignaciob@inconcertcc.com> | 2015-06-25 12:47:03 -0300 |
| commit | 79ffabfb806ff608db0cb9356627c61889b73284 (patch) | |
| tree | 23286d694869394ca4b5244462d5ceb169c9c6e0 | |
| parent | 797b95f830c7a2fbd886e74ff7b441fbc41b0701 (diff) | |
| download | luarocks-79ffabfb806ff608db0cb9356627c61889b73284.tar.gz luarocks-79ffabfb806ff608db0cb9356627c61889b73284.tar.bz2 luarocks-79ffabfb806ff608db0cb9356627c61889b73284.zip | |
Don't restrict the generator override to mingw
| -rw-r--r-- | src/luarocks/build/cmake.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/luarocks/build/cmake.lua b/src/luarocks/build/cmake.lua index 22ee2cde..7b16fa51 100644 --- a/src/luarocks/build/cmake.lua +++ b/src/luarocks/build/cmake.lua | |||
| @@ -39,7 +39,7 @@ function cmake.run(rockspec) | |||
| 39 | local args = "" | 39 | local args = "" |
| 40 | 40 | ||
| 41 | -- Try to pick the best generator. With msvc and x64, CMake does not select it by default so we need to be explicit. | 41 | -- Try to pick the best generator. With msvc and x64, CMake does not select it by default so we need to be explicit. |
| 42 | if cfg.is_platform("mingw32") and cfg.cmake_generator then | 42 | if cfg.cmake_generator then |
| 43 | args = args .. ' -G"'..cfg.cmake_generator.. '"' | 43 | args = args .. ' -G"'..cfg.cmake_generator.. '"' |
| 44 | elseif cfg.is_platform("windows") and cfg.target_cpu:match("x86_64$") then | 44 | elseif cfg.is_platform("windows") and cfg.target_cpu:match("x86_64$") then |
| 45 | args = args .. " -DCMAKE_GENERATOR_PLATFORM=x64" | 45 | args = args .. " -DCMAKE_GENERATOR_PLATFORM=x64" |