Skip to content

Commit fade2c9

Browse files
committed
Add support for boost in Get-ArgumentsFromConfig
1 parent 9ce389b commit fade2c9

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

extension/BuildPhpExtension/BuildPhpExtension.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
'Add-PhpDependencies',
8080
'Add-StepLog',
8181
'Add-Vs',
82-
'Get-ArgumentFromConfig',
82+
'Get-ArgumentsFromConfig',
8383
'Get-BuildDirectory',
8484
'Get-Extension',
8585
'Get-ExtensionConfig',

extension/BuildPhpExtension/private/Get-ArgumentFromConfig.ps1 renamed to extension/BuildPhpExtension/private/Get-ArgumentsFromConfig.ps1

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Function Get-ArgumentFromConfig {
1+
Function Get-ArgumentsFromConfig {
22
<#
33
.SYNOPSIS
44
Get the Libraries from the config.w32 file
@@ -31,6 +31,12 @@ Function Get-ArgumentFromConfig {
3131
$dashedExtension = $Extension
3232
}
3333

34+
$arguments = @()
35+
36+
if($configW32Content.contains('ARG_WITH("boost"')) {
37+
$arguments += "--with-boost=..\deps\boost"
38+
}
39+
3440
$argValue='';
3541
if($ConfigW32Content.Contains("PHP_$($Extension.ToUpper())_SHARED")) {
3642
$argValue = "shared"
@@ -46,7 +52,8 @@ Function Get-ArgumentFromConfig {
4652
if($argValue -ne '') {
4753
$arg="$arg=$argValue"
4854
}
49-
return $arg
55+
$arguments += $arg
56+
return $arguments
5057
}
5158
end {
5259
}

extension/BuildPhpExtension/private/Get-ExtensionConfig.ps1

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,12 @@ Function Get-ExtensionConfig {
153153
}
154154

155155
if($env:AUTO_DETECT_ARGS -eq 'true') {
156-
$argument = Get-ArgumentFromConfig $Extension $configW32Content
157-
$argumentKey = $argument.Split("=")[0]
158-
if($null -ne $argument -and -not($config.options.contains($argumentKey))) {
159-
$config.options += " $argument"
156+
$arguments = Get-ArgumentsFromConfig $Extension $configW32Content
157+
foreach ($argument in $arguments) {
158+
$argumentKey = $argument.Split("=")[0]
159+
if ($null -ne $argument -and -not ($config.options.contains($argumentKey))) {
160+
$config.options += " $argument"
161+
}
160162
}
161163
}
162164

0 commit comments

Comments
 (0)