Skip to content

Commit d55c364

Browse files
authored
Merge pull request #10312 from Icinga/win-configure-cmake-opts
tools/win32/configure*.ps1: allow custom $CMAKE_ARGS (JSON array)
2 parents 866db3b + 4175a47 commit d55c364

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
}
@@ -60,7 +63,8 @@ if (Test-Path CMakeCache.txt) {
6063
-DBOOST_LIBRARYDIR="$env:BOOST_LIBRARYDIR" `
6164
-DBOOST_INCLUDEDIR="$env:BOOST_ROOT" `
6265
-DFLEX_EXECUTABLE="$env:FLEX_BINARY" `
63-
-DBISON_EXECUTABLE="$env:BISON_BINARY"
66+
-DBISON_EXECUTABLE="$env:BISON_BINARY" `
67+
$(ConvertFrom-Json -InputObject "$env:CMAKE_ARGS")
6468

6569
cd "$sourcePath"
6670

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
}
@@ -63,7 +66,8 @@ if (Test-Path CMakeCache.txt) {
6366
-DBOOST_LIBRARYDIR="$env:BOOST_LIBRARYDIR" `
6467
-DBOOST_INCLUDEDIR="$env:BOOST_ROOT" `
6568
-DFLEX_EXECUTABLE="$env:FLEX_BINARY" `
66-
-DBISON_EXECUTABLE="$env:BISON_BINARY"
69+
-DBISON_EXECUTABLE="$env:BISON_BINARY" `
70+
$(ConvertFrom-Json -InputObject "$env:CMAKE_ARGS")
6771

6872
cd "$sourcePath"
6973

0 commit comments

Comments
 (0)