tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-22 05:04:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10314 from Icinga/win-configure-cmake-opts214

Browse Source 
tools/win32/configure*.ps1: allow custom $CMAKE_ARGS (JSON array)
This commit is contained in:
Julian Brost 2025-01-22 12:04:52 +01:00 committed by GitHub
commit a8c9192e41
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/win32/configure-dev.ps1
View File

@ -27,6 +27,9 @@ if (-not (Test-Path env:CMAKE_GENERATOR)) {
if (-not (Test-Path env:CMAKE_GENERATOR_PLATFORM)) { if (-not (Test-Path env:CMAKE_GENERATOR_PLATFORM)) {
$env:CMAKE_GENERATOR_PLATFORM = 'x64' $env:CMAKE_GENERATOR_PLATFORM = 'x64'
} }
if (-not (Test-Path env:CMAKE_ARGS)) {
$env:CMAKE_ARGS = '[]'
}
if (-not (Test-Path env:OPENSSL_ROOT_DIR)) { if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
$env:OPENSSL_ROOT_DIR = 'c:\local\OpenSSL-Win64' $env:OPENSSL_ROOT_DIR = 'c:\local\OpenSSL-Win64'
} }
@ -60,7 +63,8 @@ if (Test-Path CMakeCache.txt) {
-DBOOST_LIBRARYDIR="$env:BOOST_LIBRARYDIR" ` -DBOOST_LIBRARYDIR="$env:BOOST_LIBRARYDIR" `
-DBOOST_INCLUDEDIR="$env:BOOST_ROOT" ` -DBOOST_INCLUDEDIR="$env:BOOST_ROOT" `
-DFLEX_EXECUTABLE="$env:FLEX_BINARY" ` -DFLEX_EXECUTABLE="$env:FLEX_BINARY" `
-DBISON_EXECUTABLE="$env:BISON_BINARY" -DBISON_EXECUTABLE="$env:BISON_BINARY" `
$(ConvertFrom-Json -InputObject "$env:CMAKE_ARGS")
cd "$sourcePath" cd "$sourcePath"

6
tools/win32/configure.ps1
View File

@ -29,6 +29,9 @@ if (-not (Test-Path env:CMAKE_GENERATOR_PLATFORM)) {
$env:CMAKE_GENERATOR_PLATFORM = 'x64' $env:CMAKE_GENERATOR_PLATFORM = 'x64'
} }
} }
if (-not (Test-Path env:CMAKE_ARGS)) {
$env:CMAKE_ARGS = '[]'
}
if (-not (Test-Path env:OPENSSL_ROOT_DIR)) { if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
$env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_3_0_15-Win${env:BITS}" $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_LIBRARYDIR="$env:BOOST_LIBRARYDIR" `
-DBOOST_INCLUDEDIR="$env:BOOST_ROOT" ` -DBOOST_INCLUDEDIR="$env:BOOST_ROOT" `
-DFLEX_EXECUTABLE="$env:FLEX_BINARY" ` -DFLEX_EXECUTABLE="$env:FLEX_BINARY" `
-DBISON_EXECUTABLE="$env:BISON_BINARY" -DBISON_EXECUTABLE="$env:BISON_BINARY" `
$(ConvertFrom-Json -InputObject "$env:CMAKE_ARGS")
cd "$sourcePath" cd "$sourcePath"