Skip to content

Commit fbdcf15

Browse files
authored
Merge pull request #10315 from Icinga/win-configure-cmake-opts213
tools/win32/configure*.ps1: allow custom $CMAKE_ARGS (JSON array)
2 parents fdfa11b + a3b00fd commit fbdcf15

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

tools/win32/configure-dev.ps1

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ if (-not (Test-Path env:CMAKE_GENERATOR)) {
2727
if (-not (Test-Path env:CMAKE_GENERATOR_PLATFORM)) {
2828
$env:CMAKE_GENERATOR_PLATFORM = 'x64'
2929
}
30+
if (-not (Test-Path env:CMAKE_ARGS)) {
31+
$env:CMAKE_ARGS = '[]'
32+
}
3033
if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
3134
$env:OPENSSL_ROOT_DIR = 'c:\local\OpenSSL-Win64'
3235
}
@@ -62,7 +65,8 @@ if (Test-Path CMakeCache.txt) {
6265
-DBOOST_LIBRARYDIR="$env:BOOST_LIBRARYDIR" `
6366
-DBOOST_INCLUDEDIR="$env:BOOST_ROOT" `
6467
-DFLEX_EXECUTABLE="$env:FLEX_BINARY" `
65-
-DBISON_EXECUTABLE="$env:BISON_BINARY"
68+
-DBISON_EXECUTABLE="$env:BISON_BINARY" `
69+
$(ConvertFrom-Json -InputObject "$env:CMAKE_ARGS")
6670

6771
cd "$sourcePath"
6872

tools/win32/configure.ps1

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ if (-not (Test-Path env:CMAKE_GENERATOR_PLATFORM)) {
2929
$env:CMAKE_GENERATOR_PLATFORM = 'x64'
3030
}
3131
}
32+
if (-not (Test-Path env:CMAKE_ARGS)) {
33+
$env:CMAKE_ARGS = '[]'
34+
}
3235
if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
3336
$env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_3_0_15-Win${env:BITS}"
3437
}
@@ -65,7 +68,8 @@ if (Test-Path CMakeCache.txt) {
6568
-DBOOST_LIBRARYDIR="$env:BOOST_LIBRARYDIR" `
6669
-DBOOST_INCLUDEDIR="$env:BOOST_ROOT" `
6770
-DFLEX_EXECUTABLE="$env:FLEX_BINARY" `
68-
-DBISON_EXECUTABLE="$env:BISON_BINARY"
71+
-DBISON_EXECUTABLE="$env:BISON_BINARY" `
72+
$(ConvertFrom-Json -InputObject "$env:CMAKE_ARGS")
6973

7074
cd "$sourcePath"
7175

0 commit comments

Comments
 (0)