Changeset View
Changeset View
Standalone View
Standalone View
modules/ksb/BuildSystem/KDE4.pm
Show All 26 Lines | |||||
27 | 27 | | |||
28 | # Called by the module being built before it runs its build/install process. Should | 28 | # Called by the module being built before it runs its build/install process. Should | ||
29 | # setup any needed environment variables, build context settings, etc., in preparation | 29 | # setup any needed environment variables, build context settings, etc., in preparation | ||
30 | # for the build and install phases. | 30 | # for the build and install phases. | ||
31 | sub prepareModuleBuildEnvironment | 31 | sub prepareModuleBuildEnvironment | ||
32 | { | 32 | { | ||
33 | my ($self, $ctx, $module, $prefix) = @_; | 33 | my ($self, $ctx, $module, $prefix) = @_; | ||
34 | 34 | | |||
35 | # Avoid moving /usr up in env vars | ||||
36 | if ($prefix ne '/usr') { | ||||
35 | $ctx->prependEnvironmentValue('CMAKE_PREFIX_PATH', $prefix); | 37 | $ctx->prependEnvironmentValue('CMAKE_PREFIX_PATH', $prefix); | ||
36 | $ctx->prependEnvironmentValue('XDG_DATA_DIRS', "$prefix/share"); | 38 | $ctx->prependEnvironmentValue('XDG_DATA_DIRS', "$prefix/share"); | ||
39 | } | ||||
37 | 40 | | |||
38 | my $qtdir = $module->getOption('qtdir'); | 41 | my $qtdir = $module->getOption('qtdir'); | ||
39 | if ($qtdir && $qtdir ne $prefix) { | 42 | if ($qtdir && $qtdir ne $prefix) { | ||
40 | # Ensure we can find Qt5's own CMake modules | 43 | # Ensure we can find Qt5's own CMake modules | ||
41 | $ctx->prependEnvironmentValue('CMAKE_MODULE_PATH', "$qtdir/lib/cmake"); | 44 | $ctx->prependEnvironmentValue('CMAKE_MODULE_PATH', "$qtdir/lib/cmake"); | ||
42 | } | 45 | } | ||
43 | } | 46 | } | ||
44 | 47 | | |||
▲ Show 20 Lines • Show All 181 Lines • Show Last 20 Lines |