From 7866308e3126140b11358d4ebf4493f3e8c39c0c Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Tue, 21 Jan 2025 17:50:39 +0100 Subject: [PATCH] tools/win32/configure*.ps1: allow custom $CMAKE_ARGS (JSON array) --- tools/win32/configure-dev.ps1 | 6 +++++- tools/win32/configure.ps1 | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/win32/configure-dev.ps1 b/tools/win32/configure-dev.ps1 index 12cc004c8..a2caeb201 100644 --- a/tools/win32/configure-dev.ps1 +++ b/tools/win32/configure-dev.ps1 @@ -27,6 +27,9 @@ if (-not (Test-Path env:CMAKE_GENERATOR)) { if (-not (Test-Path env:CMAKE_GENERATOR_PLATFORM)) { $env:CMAKE_GENERATOR_PLATFORM = 'x64' } +if (-not (Test-Path env:CMAKE_ARGS)) { + $env:CMAKE_ARGS = '[]' +} if (-not (Test-Path env:OPENSSL_ROOT_DIR)) { $env:OPENSSL_ROOT_DIR = 'c:\local\OpenSSL-Win64' } @@ -60,7 +63,8 @@ if (Test-Path CMakeCache.txt) { -DBOOST_LIBRARYDIR="$env:BOOST_LIBRARYDIR" ` -DBOOST_INCLUDEDIR="$env:BOOST_ROOT" ` -DFLEX_EXECUTABLE="$env:FLEX_BINARY" ` - -DBISON_EXECUTABLE="$env:BISON_BINARY" + -DBISON_EXECUTABLE="$env:BISON_BINARY" ` + $(ConvertFrom-Json -InputObject "$env:CMAKE_ARGS") cd "$sourcePath" diff --git a/tools/win32/configure.ps1 b/tools/win32/configure.ps1 index 1fb83c118..7ab3dbc52 100644 --- a/tools/win32/configure.ps1 +++ b/tools/win32/configure.ps1 @@ -29,6 +29,9 @@ if (-not (Test-Path env:CMAKE_GENERATOR_PLATFORM)) { $env:CMAKE_GENERATOR_PLATFORM = 'x64' } } +if (-not (Test-Path env:CMAKE_ARGS)) { + $env:CMAKE_ARGS = '[]' +} if (-not (Test-Path env:OPENSSL_ROOT_DIR)) { $env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_3_0_15-Win${env:BITS}" } @@ -63,7 +66,8 @@ if (Test-Path CMakeCache.txt) { -DBOOST_LIBRARYDIR="$env:BOOST_LIBRARYDIR" ` -DBOOST_INCLUDEDIR="$env:BOOST_ROOT" ` -DFLEX_EXECUTABLE="$env:FLEX_BINARY" ` - -DBISON_EXECUTABLE="$env:BISON_BINARY" + -DBISON_EXECUTABLE="$env:BISON_BINARY" ` + $(ConvertFrom-Json -InputObject "$env:CMAKE_ARGS") cd "$sourcePath"