From 2f67e772cea01c426caeafb5edf1f73c375de9e5 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 21 Apr 2020 22:40:34 +0800 Subject: fix cmake config --- xmake/modules/package/tools/cmake.lua | 2 +- xmake/modules/private/action/trybuild/cmake.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index 313d15396..701e8c928 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -93,7 +93,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/ on Debian) -- - local argv = {"-DCMAKE_INSTALL_PREFIX=" .. path.absolute("install"), "-DDCMAKE_INSTALL_LIBDIR=" .. path.absolute("install/lib")} + local argv = {"-DCMAKE_INSTALL_PREFIX=" .. path.absolute("install"), "-DCMAKE_INSTALL_LIBDIR=" .. path.absolute("install/lib")} if package:is_plat("windows") and package:is_arch("x64") then table.insert(argv, "-A") table.insert(argv, "x64") diff --git a/xmake/modules/private/action/trybuild/cmake.lua b/xmake/modules/private/action/trybuild/cmake.lua index 9007c53c8..8ca785a47 100644 --- a/xmake/modules/private/action/trybuild/cmake.lua +++ b/xmake/modules/private/action/trybuild/cmake.lua @@ -39,7 +39,7 @@ end function _get_configs(artifacts_dir) -- add prefix - local configs = {"-DCMAKE_INSTALL_PREFIX=" .. artifacts_dir, "-DDCMAKE_INSTALL_LIBDIR=" .. path.join(artifacts_dir, "lib")} + local configs = {"-DCMAKE_INSTALL_PREFIX=" .. artifacts_dir, "-DCMAKE_INSTALL_LIBDIR=" .. path.join(artifacts_dir, "lib")} if is_plat("windows") and is_arch("x64") then table.insert(configs, "-A") table.insert(configs, "x64") -- cgit v1.3.1