summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2019-11-19 00:48:38 +0800
committerruki <[email protected]>2019-11-18 22:51:50 +0800
commit618ff7b329f384323845ec12d7be5acd47fcaea9 (patch)
treecb6da8f8284e705717b358a67fcf3a6adee79897
parent299862deb370f5b9df641dfa5a4fc7d20923a042 (diff)
improve the installed library dir of tools/cmake
-rw-r--r--xmake/modules/package/tools/cmake.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua
index 75b38eaf1..04b7faa37 100644
--- a/xmake/modules/package/tools/cmake.lua
+++ b/xmake/modules/package/tools/cmake.lua
@@ -89,7 +89,11 @@ function install(package, configs, opt)
local oldir = os.cd(buildir)
-- init arguments
- local argv = {"-DCMAKE_INSTALL_PREFIX=" .. path.absolute("install")}
+ --
+ -- @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"), "-DDCMAKE_INSTALL_LIBDIR=" .. path.absolute("install/lib")}
if is_plat("windows") and is_arch("x64") then
table.insert(argv, "-A")
table.insert(argv, "x64")