summaryrefslogtreecommitdiff
path: root/xmake
diff options
context:
space:
mode:
authorruki <[email protected]>2021-06-29 00:10:09 +0800
committerruki <[email protected]>2021-06-29 00:10:09 +0800
commit086e0afb0c5ca2de85231a0cc4b6f52c93508d09 (patch)
tree8dc72d0ae830a8564f31eb62270a1f86d8710fb3 /xmake
parent61147dc43fd140910c6e1ebfd8efd58d7acce78a (diff)
fix trailing spaces
Diffstat (limited to 'xmake')
-rw-r--r--xmake/modules/detect/packages/find_mkl.lua146
-rw-r--r--xmake/modules/detect/packages/find_tbb.lua122
-rw-r--r--xmake/rules/qt/install/windows.lua2
3 files changed, 135 insertions, 135 deletions
diff --git a/xmake/modules/detect/packages/find_mkl.lua b/xmake/modules/detect/packages/find_mkl.lua
index 7de9270c6..a34d2bf3a 100644
--- a/xmake/modules/detect/packages/find_mkl.lua
+++ b/xmake/modules/detect/packages/find_mkl.lua
@@ -1,73 +1,73 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- 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-present, TBOOX Open Source Group.
---
--- @author xq114
--- @file find_mkl.lua
---
-
--- imports
-import("lib.detect.find_path")
-import("lib.detect.find_library")
-import("lib.detect.find_package")
-
--- find mkl
---
--- @param opt the package options. e.g. see the options of find_package()
---
--- @return see the return value of find_package()
---
-function main(opt)
-
- -- for windows platform
- if opt.plat == "windows" then
-
- -- init bits
- local rdir = (opt.arch == "x64" and "intel64" or "ia32")
-
- -- init search paths
- local paths = {
- "$(env ONEAPI_ROOT)\\mkl\\latest"
- }
-
- -- find library
- local result = {links = {}, linkdirs = {}, includedirs = {}, threading = ""}
- local linkinfo = find_library("mkl_core", paths, {suffixes = path.join("lib", rdir)})
- if not linkinfo then
- return
- end
- table.insert(result.linkdirs, linkinfo.linkdir)
- if rdir == "intel64" then
- table.insert(result.links, "mkl_intel_ilp64")
- else
- table.insert(result.links, "mkl_intel_c")
- end
-
- -- use tbb if available
- local tbb_res = find_package("tbb")
- if tbb_res then
- table.join2(result.linkdirs, tbb_res.linkdirs)
- table.join2(result.links, {"mkl_tbb_thread", "mkl_core", "tbb"})
- result.threading = "tbb"
- else
- table.join2(result.links, {"mkl_sequential", "mkl_core"})
- result.threading = "seq"
- end
-
- -- find include
- table.insert(result.includedirs, find_path("mkl.h", paths, {suffixes = "include"}))
- return result
- end
-end
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- 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-present, TBOOX Open Source Group.
+--
+-- @author xq114
+-- @file find_mkl.lua
+--
+
+-- imports
+import("lib.detect.find_path")
+import("lib.detect.find_library")
+import("lib.detect.find_package")
+
+-- find mkl
+--
+-- @param opt the package options. e.g. see the options of find_package()
+--
+-- @return see the return value of find_package()
+--
+function main(opt)
+
+ -- for windows platform
+ if opt.plat == "windows" then
+
+ -- init bits
+ local rdir = (opt.arch == "x64" and "intel64" or "ia32")
+
+ -- init search paths
+ local paths = {
+ "$(env ONEAPI_ROOT)\\mkl\\latest"
+ }
+
+ -- find library
+ local result = {links = {}, linkdirs = {}, includedirs = {}, threading = ""}
+ local linkinfo = find_library("mkl_core", paths, {suffixes = path.join("lib", rdir)})
+ if not linkinfo then
+ return
+ end
+ table.insert(result.linkdirs, linkinfo.linkdir)
+ if rdir == "intel64" then
+ table.insert(result.links, "mkl_intel_ilp64")
+ else
+ table.insert(result.links, "mkl_intel_c")
+ end
+
+ -- use tbb if available
+ local tbb_res = find_package("tbb")
+ if tbb_res then
+ table.join2(result.linkdirs, tbb_res.linkdirs)
+ table.join2(result.links, {"mkl_tbb_thread", "mkl_core", "tbb"})
+ result.threading = "tbb"
+ else
+ table.join2(result.links, {"mkl_sequential", "mkl_core"})
+ result.threading = "seq"
+ end
+
+ -- find include
+ table.insert(result.includedirs, find_path("mkl.h", paths, {suffixes = "include"}))
+ return result
+ end
+end
diff --git a/xmake/modules/detect/packages/find_tbb.lua b/xmake/modules/detect/packages/find_tbb.lua
index dd0829750..e06bcfeb1 100644
--- a/xmake/modules/detect/packages/find_tbb.lua
+++ b/xmake/modules/detect/packages/find_tbb.lua
@@ -1,61 +1,61 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- 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-present, TBOOX Open Source Group.
---
--- @author xq114
--- @file find_tbb.lua
---
-
--- imports
-import("lib.detect.find_path")
-import("lib.detect.find_library")
-
--- find tbb
---
--- @param opt the package options. e.g. see the options of find_package()
---
--- @return see the return value of find_package()
---
-function main(opt)
-
- -- for windows platform
- if opt.plat == "windows" then
-
- -- init bits
- local rdir = (opt.arch == "x64" and "intel64" or "ia32")
-
- -- init search paths
- local paths = {
- "$(env ONEAPI_ROOT)\\tbb\\latest"
- }
-
- -- find library
- local result = {links = {}, linkdirs = {}, includedirs = {}}
- local linkinfo = find_library("tbb", paths, {suffixes = path.join("lib", rdir, "vc14")})
- if linkinfo then
- table.insert(result.linkdirs, linkinfo.linkdir)
- table.join2(result.links, {"tbb", "tbb_malloc"})
- else
- -- not found?
- return
- end
-
- -- find include
- table.insert(result.includedirs, find_path(path.join("tbb", "tbb.h"), paths, {suffixes = "include"}))
-
- -- ok
- return result
- end
-end
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- 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-present, TBOOX Open Source Group.
+--
+-- @author xq114
+-- @file find_tbb.lua
+--
+
+-- imports
+import("lib.detect.find_path")
+import("lib.detect.find_library")
+
+-- find tbb
+--
+-- @param opt the package options. e.g. see the options of find_package()
+--
+-- @return see the return value of find_package()
+--
+function main(opt)
+
+ -- for windows platform
+ if opt.plat == "windows" then
+
+ -- init bits
+ local rdir = (opt.arch == "x64" and "intel64" or "ia32")
+
+ -- init search paths
+ local paths = {
+ "$(env ONEAPI_ROOT)\\tbb\\latest"
+ }
+
+ -- find library
+ local result = {links = {}, linkdirs = {}, includedirs = {}}
+ local linkinfo = find_library("tbb", paths, {suffixes = path.join("lib", rdir, "vc14")})
+ if linkinfo then
+ table.insert(result.linkdirs, linkinfo.linkdir)
+ table.join2(result.links, {"tbb", "tbb_malloc"})
+ else
+ -- not found?
+ return
+ end
+
+ -- find include
+ table.insert(result.includedirs, find_path(path.join("tbb", "tbb.h"), paths, {suffixes = "include"}))
+
+ -- ok
+ return result
+ end
+end
diff --git a/xmake/rules/qt/install/windows.lua b/xmake/rules/qt/install/windows.lua
index deba297c1..69d4c1c70 100644
--- a/xmake/rules/qt/install/windows.lua
+++ b/xmake/rules/qt/install/windows.lua
@@ -29,7 +29,7 @@ function main(target, opt)
local targetfile = target:targetfile()
local installfile = path.join(target:installdir(), "bin", path.filename(targetfile))
-
+
-- get qt sdk
local qt = target:data("qt")