make boost link statically, add missing static definitions to libsbml/combine

Author: lkeegan

.github/workflows/release.yml

@@ -79,7 +79,7 @@ jobs:
       TBB_SANITIZE: ${{ matrix.TBB_SANITIZE }}
       BUILD_TAG: ${{ matrix.BUILD_TAG }}
     steps:
-      - uses: spatial-model-editor/setup-ci@2026.03.27
+      - uses: spatial-model-editor/setup-ci@2026.03.30
         with:
           sme_deps_llvm: ${{ env.LLVM_VERSION }}
           sme_deps_qt: ${{ env.QT_VERSION }}

build.ps1

@@ -68,6 +68,11 @@ function Invoke-CMakeConfigure {
       $configureArgs += "-DCMAKE_MSVC_RUNTIME_LIBRARY=$env:CMAKE_MSVC_RUNTIME_LIBRARY"
     }
   }
+  if ($env:CMAKE_CXX_FLAGS) {
+    if (-not ($configureArgs | Where-Object { $_ -like "-DCMAKE_CXX_FLAGS=*" })) {
+      $configureArgs += "-DCMAKE_CXX_FLAGS=$env:CMAKE_CXX_FLAGS"
+    }
+  }
   if (Get-Command ccache -ErrorAction SilentlyContinue) {
     if (-not ($configureArgs | Where-Object { $_ -like "-DCMAKE_C_COMPILER_LAUNCHER=*" })) {
       $configureArgs += "-DCMAKE_C_COMPILER_LAUNCHER=ccache"
@@ -93,6 +98,27 @@ function Invoke-CMakeInstall {
   cmake --install .
 }
 
+function Add-ImportedTargetCompileDefinitions {
+  param(
+    [Parameter(Mandatory)] [string]$TargetsFile,
+    [Parameter(Mandatory)] [string]$TargetName,
+    [Parameter(Mandatory)] [string[]]$Definitions
+  )
+
+  if (-not (Test-Path $TargetsFile)) {
+    throw "Could not find imported targets file: $TargetsFile"
+  }
+
+  $targetsContents = Get-Content -Path $TargetsFile -Raw
+  if ($targetsContents -like "*set_property(TARGET $TargetName APPEND PROPERTY*") {
+    return
+  }
+
+  $definitionList = ($Definitions | ForEach-Object { '"{0}"' -f $_ }) -join " "
+  $patch = "`nset_property(TARGET $TargetName APPEND PROPERTY`n  INTERFACE_COMPILE_DEFINITIONS $definitionList)`n"
+  Add-Content -Path $TargetsFile -Value $patch
+}
+
 function Resolve-LibraryPath {
   param(
     [Parameter(Mandatory)] [string[]]$Patterns,
@@ -237,6 +263,7 @@ Write-Host "TARGET_TRIPLE = $env:TARGET_TRIPLE"
 Write-Host "HOST_TRIPLE = $env:HOST_TRIPLE"
 Write-Host "MSVC_PLATFORM = $msvcPlatform"
 Write-Host "CMAKE_MSVC_RUNTIME_LIBRARY = $env:CMAKE_MSVC_RUNTIME_LIBRARY"
+Write-Host "CMAKE_CXX_FLAGS = $env:CMAKE_CXX_FLAGS"
 Write-Host "PYTHON_EXE = $pythonExe"
 Write-Host "LLVM_VERSION = $env:LLVM_VERSION"
 Write-Host "QT_VERSION = $env:QT_VERSION"
@@ -400,7 +427,7 @@ $boostB2Args = @(
 if ($env:BOOST_B2_OPTIONS) {
   $boostB2Args += $env:BOOST_B2_OPTIONS -split " "
 }
-$boostB2Args += @("link=static", "install")
+$boostB2Args += @("link=static", "runtime-link=static", "install")
 & .\b2 @boostB2Args
 Pop-Location
 
@@ -437,6 +464,8 @@ $catch2Args = @(
   "-DBUILD_SHARED_LIBS=OFF",
   "-DCMAKE_INSTALL_PREFIX=$env:INSTALL_PREFIX",
   "-DCMAKE_PREFIX_PATH=$env:INSTALL_PREFIX",
+  "-DCMAKE_CXX_STANDARD=20",
+  "-DCMAKE_CXX_STANDARD_REQUIRED=ON",
   "-DCATCH_INSTALL_DOCS=OFF",
   "-DCATCH_CONFIG_NO_POSIX_SIGNALS=1",
   "-DCATCH_INSTALL_EXTRAS=ON"
@@ -695,6 +724,7 @@ $libsbmlArgs = @(
 Invoke-CMakeConfigure $libsbmlArgs
 Invoke-CMakeBuild
 Invoke-CMakeInstall
+Add-ImportedTargetCompileDefinitions   -TargetsFile (Join-Path $env:INSTALL_PREFIX "lib\cmake\libsbml-static-targets.cmake")   -TargetName "libsbml-static"   -Definitions @("LIBSBML_STATIC=1", "LIBLAX_STATIC=1")
 Pop-Location
 Pop-Location
 
@@ -723,6 +753,7 @@ $libCombineArgs = @(
 Invoke-CMakeConfigure $libCombineArgs
 Invoke-CMakeBuild
 Invoke-CMakeInstall
+Add-ImportedTargetCompileDefinitions   -TargetsFile (Join-Path $env:BOOST_INSTALL_PREFIX "lib\cmake\libCombine-static-targets.cmake")   -TargetName "libCombine-static"   -Definitions @("LIBCOMBINE_STATIC=1")
 Pop-Location
 Pop-Location