summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-10-29 00:09:36 +0800
committerruki <[email protected]>2020-10-29 00:09:36 +0800
commit140d675280a6cb46c02ed48c925fb0f694f70f21 (patch)
tree5c4555f301e00789e0ca001f3add4ab122be2f84
parentd8f2dd826196dd6ec22b86a7da6bf5579b3d59a0 (diff)
improve xrepo env
-rw-r--r--xmake/modules/private/xrepo/action/env.lua6
1 files changed, 6 insertions, 0 deletions
diff --git a/xmake/modules/private/xrepo/action/env.lua b/xmake/modules/private/xrepo/action/env.lua
index f638abcbc..2b49e6172 100644
--- a/xmake/modules/private/xrepo/action/env.lua
+++ b/xmake/modules/private/xrepo/action/env.lua
@@ -159,6 +159,11 @@ end
-- add package environments
function _package_addenvs(envs, instance)
+ -- only for xmake::package
+ if instance:isSys() then
+ return
+ end
+
-- add run envs, e.g. PATH, LD_LIBRARY_PATH, ..
local installdir = instance:installdir()
for name, values in pairs(instance:envs()) do
@@ -189,6 +194,7 @@ function _package_addenvs(envs, instance)
if os.isdir(aclocal) then
_package_addenv(envs, "ACLOCAL_PATH", aclocal)
end
+ _package_addenv(envs, "CMAKE_PREFIX_PATH", installdir)
end
end