File tree 2 files changed +10
-2
lines changed
2 files changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -27,6 +27,9 @@ if (-not (Test-Path env:CMAKE_GENERATOR)) {
27
27
if (-not (Test-Path env:CMAKE_GENERATOR_PLATFORM)) {
28
28
$env: CMAKE_GENERATOR_PLATFORM = ' x64'
29
29
}
30
+ if (-not (Test-Path env:CMAKE_ARGS)) {
31
+ $env: CMAKE_ARGS = ' []'
32
+ }
30
33
if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
31
34
$env: OPENSSL_ROOT_DIR = ' c:\local\OpenSSL-Win64'
32
35
}
@@ -60,7 +63,8 @@ if (Test-Path CMakeCache.txt) {
60
63
- DBOOST_LIBRARYDIR= " $env: BOOST_LIBRARYDIR " `
61
64
- DBOOST_INCLUDEDIR= " $env: BOOST_ROOT " `
62
65
- DFLEX_EXECUTABLE= " $env: FLEX_BINARY " `
63
- - DBISON_EXECUTABLE= " $env: BISON_BINARY "
66
+ - DBISON_EXECUTABLE= " $env: BISON_BINARY " `
67
+ $ (ConvertFrom-Json - InputObject " $env: CMAKE_ARGS " )
64
68
65
69
cd " $sourcePath "
66
70
Original file line number Diff line number Diff line change @@ -29,6 +29,9 @@ if (-not (Test-Path env:CMAKE_GENERATOR_PLATFORM)) {
29
29
$env: CMAKE_GENERATOR_PLATFORM = ' x64'
30
30
}
31
31
}
32
+ if (-not (Test-Path env:CMAKE_ARGS)) {
33
+ $env: CMAKE_ARGS = ' []'
34
+ }
32
35
if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
33
36
$env: OPENSSL_ROOT_DIR = " c:\local\OpenSSL_3_0_15-Win${env: BITS} "
34
37
}
@@ -63,7 +66,8 @@ if (Test-Path CMakeCache.txt) {
63
66
- DBOOST_LIBRARYDIR= " $env: BOOST_LIBRARYDIR " `
64
67
- DBOOST_INCLUDEDIR= " $env: BOOST_ROOT " `
65
68
- DFLEX_EXECUTABLE= " $env: FLEX_BINARY " `
66
- - DBISON_EXECUTABLE= " $env: BISON_BINARY "
69
+ - DBISON_EXECUTABLE= " $env: BISON_BINARY " `
70
+ $ (ConvertFrom-Json - InputObject " $env: CMAKE_ARGS " )
67
71
68
72
cd " $sourcePath "
69
73
You can’t perform that action at this time.
0 commit comments