Skip to content

Commit

Permalink
-swig off by default (breaks older CI builds)
Browse files Browse the repository at this point in the history
-set execution bit on build_lin script (CI problem)
  • Loading branch information
lewk2 committed Feb 26, 2023
1 parent 3191862 commit 7971f28
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions googletest/googletest-src
Submodule googletest-src added at 703bd9
Empty file modified scripts/build-lin-docker.ps1
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions scripts/build-windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ param (
[Parameter()][String]$BUILD_DIR = "_build",
[Parameter()][String]$VCPKG_OPENSSL = "OFF",
[Parameter()][String]$BONDING = "OFF",
[Parameter()][String]$ENABLE_SWIG = "ON",
[Parameter()][String]$ENABLE_SWIG = "OFF",
[Parameter()][String]$ENABLE_SWIG_CSHARP = "ON"
)

Expand Down Expand Up @@ -203,7 +203,7 @@ else {
$cmakeFlags += " -DOPENSSL_USE_STATIC_LIBS=$STATIC_LINK_SSL "
}

# cmake uses a flag for architecture from vs2022, so add that as a suffix
# cmake uses a flag for architecture from vs2019 onwards, so add that as a suffix
if ( $VS_VERSION -eq '2019' -or $VS_VERSION -eq '2022') {
$cmakeFlags += " -A `"$DEVENV_PLATFORM`""
}
Expand Down

0 comments on commit 7971f28

Please sign in to comment.