summaryrefslogtreecommitdiff
path: root/xmake/modules/package/tools/cmake.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2020-09-25 00:33:07 +0800
committerruki <[email protected]>2020-09-25 00:33:07 +0800
commit90af4956738036172984f068502624bbc515cae7 (patch)
tree7cd7177becaf98e676ae8eaa478f042e14505d3a /xmake/modules/package/tools/cmake.lua
parent700f08a7bae11c22295f884610f98b7b99eb1790 (diff)
fix trailing white-space
Diffstat (limited to 'xmake/modules/package/tools/cmake.lua')
-rw-r--r--xmake/modules/package/tools/cmake.lua14
1 files changed, 7 insertions, 7 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua
index 7709eea4f..0b03dbe6d 100644
--- a/xmake/modules/package/tools/cmake.lua
+++ b/xmake/modules/package/tools/cmake.lua
@@ -11,7 +11,7 @@
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
---
+--
-- Copyright (C) 2015-2020, TBOOX Open Source Group.
--
-- @author ruki
@@ -178,7 +178,7 @@ function _get_configs_for_generator(package, configs, opt)
local cmake_generator = opt.cmake_generator
if cmake_generator then
if cmake_generator:find("Visual Studio", 1, true) then
- local vsvers =
+ local vsvers =
{
["2019"] = "16",
["2017"] = "15",
@@ -381,7 +381,7 @@ function build(package, configs, opt)
--
-- @see https://cmake.org/cmake/help/v3.14/module/GNUInstallDirs.html
-- LIBDIR: object code libraries (lib or lib64 or lib/<multiarch-tuple> on Debian)
- --
+ --
local argv = {"-DCMAKE_INSTALL_PREFIX=" .. path.absolute("install"), "-DCMAKE_INSTALL_LIBDIR=" .. path.absolute("install/lib")}
-- exists $CMAKE_GENERATOR? use it
@@ -403,11 +403,11 @@ function build(package, configs, opt)
end
table.insert(argv, '..')
- -- do configure
+ -- do configure
os.vrunv("cmake", argv, {envs = opt.envs or buildenvs(package)})
-- do build
- local cmake_generator = opt.cmake_generator
+ local cmake_generator = opt.cmake_generator
if opt.cmake_build then
_build_for_cmakebuild(package, configs, opt)
elseif cmake_generator then
@@ -443,7 +443,7 @@ function install(package, configs, opt)
--
-- @see https://cmake.org/cmake/help/v3.14/module/GNUInstallDirs.html
-- LIBDIR: object code libraries (lib or lib64 or lib/<multiarch-tuple> on Debian)
- --
+ --
local argv = {"-DCMAKE_INSTALL_PREFIX=" .. path.absolute("install"), "-DCMAKE_INSTALL_LIBDIR=" .. path.absolute("install/lib")}
-- exists $CMAKE_GENERATOR? use it
@@ -469,7 +469,7 @@ function install(package, configs, opt)
os.vrunv("cmake", argv, {envs = opt.envs or buildenvs(package)})
-- do build and install
- local cmake_generator = opt.cmake_generator
+ local cmake_generator = opt.cmake_generator
if opt.cmake_build then
_install_for_cmakebuild(package, configs, opt)
elseif cmake_generator then