CI: support Visual Studio 2026 (v18 / v145) generator

[timosachsenberg]

Why

GitHub Actions' windows-2025 / windows-latest runner images migrated to Visual Studio 2026 (MSVC v145) during June 2026 (rollout completed 2026-06-15), and VS2022 is no longer installed. The contrib CMake generator guard previously only accepted Visual Studio {14..17}, so the contrib build aborted immediately:

Generator "Visual Studio 17 2022" could not find any instance of Visual Studio.

and, with the VS18 generator, the guard's else() branch raised a FATAL_ERROR.

This broke the nightly OpenMS full CI (it builds contrib from source) and the contrib release workflow.

What

• CMakeLists.txt — accept the Visual Studio 18 2026 generator (VS_VERSION 18, toolset 14.5 / v145).
• libraries.cmake/coinor.cmake — the vendored CoinMP archive (CoinMP-1.8.3-vs22) only ships MSBuild solutions up to v17. For VS ≥ 18 we reuse the v17 solution and retarget the PlatformToolset (the v14x ABI is binary compatible).
• macros.cmake — OPENMS_BUILDLIB passes /p:PlatformToolset=<vNNN> to MSBuild when retargeting.
• .github/workflows/main.yml — build with the VS2026 generator on windows-latest, and pin CMake 4.3.x there (the Visual Studio 18 2026 generator requires CMake ≥ 4.2; Linux/macOS keep 3.29.x).

The VS2022 path is unchanged byte-for-byte (no toolset override when VS_VERSION == 17).

🤖 Generated with Claude Code

Summary by CodeRabbit

• Chores
  • Updated CI workflow to use OS-specific CMake versions via the build matrix.
  • Improved Windows/MSVC configuration to support newer Visual Studio versions and retarget the MSBuild platform toolset when applicable.
  • Enhanced COIN-OR Windows/MSVC builds to correctly handle newer toolset versions by reusing the appropriate CoinMP solution.
  • Reworked the Boost Windows/MSVC contrib build to use a CMake-based superproject flow, then added stricter post-install checks for expected Boost component config files.

[coderabbitai]

📝 Walkthrough

Walkthrough

Adds Visual Studio 2026 (VS18) support by extending the generator-to-toolset mapping and enabling CoinMP to reuse the vendored VS17 solution with a retargeted PlatformToolset on newer compilers. Migrates Windows/MSVC Boost builds from legacy b2/bjam to a nested CMake superproject with pinned MSVC runtime, fixed component set, and post-install verification. The CI matrix is updated to install CMake 4.3.x on Windows and 3.29.x on Linux/macOS.

Changes

VS2026 and Modernized Windows Build System

Layer / File(s)	Summary
CI matrix per-OS CMake version parameterization .github/workflows/main.yml	GitHub Actions matrix adds a CMAKE_VERSION field (Ubuntu/macOS: 3.29.x, Windows: 4.3.x) and updates Windows runner/generator comments. The "Setup cmake" step switches from a hardcoded version to the matrix-provided CMAKE_VERSION.
VS2026 generator and MSVC toolset version mapping CMakeLists.txt	Adds a Visual Studio 18.* case setting TMP_VS_VERSION=18 and TMP_MSVC_TOOLSET_VERSION=14.5 for VS2026. Updates generator error text to accept version 18. Switches Boost archive to the -cmake variant with updated SHA256 for MSVC builds.
CoinMP solution retargeting for VS18+ via PlatformToolset libraries.cmake/coinor.cmake, macros.cmake	coinor.cmake computes _COINMP_SLN_VERSION (capped at 17 for VS>17), derives CONTRIB_MSBUILD_PLATFORMTOOLSET from CONTRIB_MSVC_TOOLSET_VERSION (with dot removal and v prefix), updates the solution path to use the computed version, and emits a retargeting status message. macros.cmake appends /p:PlatformToolset=... to MSBuild arguments when CONTRIB_MSBUILD_PLATFORMTOOLSET is defined.
Windows/MSVC Boost build migration to CMake superproject libraries.cmake/boost.cmake	Replaces legacy bootstrap.bat/b2.exe/bjam.exe flow with a nested Boost CMake superproject invoked via execute_process. Creates an out-of-source build-openms directory, configures once with pinned MSVC runtime (CMAKE_MSVC_RUNTIME_LIBRARY), restricted library set (6 components via BOOST_INCLUDE_LIBRARIES), and disabled ICU/compression backends. Builds and installs both Debug and Release into a shared prefix, appends all output, and fails with FATAL_ERROR on non-zero results. Post-install verification checks that per-component CMake config directories exist under lib/cmake/boost_<component>-* for all six compiled components, failing loudly if any are missing.

Possibly Related PRs

• OpenMS/contrib#161: Both PRs modify macros.cmake's OPENMS_BUILDLIB macro (one adds /p:PlatformToolset retargeting, the other rewrites its execution/error handling from exec_program to execute_process).
• OpenMS/contrib#156: Both PRs modify .github/workflows/main.yml's build matrix and the CMake setup logic/steps (main PR parameterizes CMake versions per OS, retrieved PR adds an ARM Ubuntu 22.04 matrix entry with conditional CMake install), so the workflow changes are closely connected.
• OpenMS/contrib#153: Both PRs modify libraries.cmake/boost.cmake's OPENMS_CONTRIB_BUILD_BOOST build invocation (main PR rewrites the Boost CMake superproject build steps, while the retrieved PR adds/reuses a compiler-specific BOOST_EXTRA_CXXFLAGS), so the changes are directly related at the Boost build-logic level.

Poem

A rabbit hops through CMake land,
VS2026 now joins the band!
Old solutions retarget with glee,
Boost builds grow from CMake tree.
Four-dot-three on Windows we go,
Building contrib with flair and flow! 🐇✨

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title directly and accurately summarizes the main objective of this pull request: adding Visual Studio 2026 (v18/v145) generator support to the OpenMS contrib build system.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch ci-vs2026-migration

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[coderabbitai]

🧹 Nitpick comments (1)

libraries.cmake/coinor.cmake (1)

46-53: ⚡ Quick win

Limit CONTRIB_MSBUILD_PLATFORMTOOLSET scope to CoinMP builds only.

CONTRIB_MSBUILD_PLATFORMTOOLSET is set as global state and consumed by OPENMS_BUILDLIB, so the override can leak into later library builds. Clear it after the CoinMP targets (or pass it explicitly per call) to avoid cross-library side effects.

Proposed adjustment

@@
     OPENMS_BUILDLIB("CoinOR-OsiClp (Debug)" MSBUILD_ARGS_SLN MSBUILD_ARGS_TARGET "Debug" COINOR_DIR)
     OPENMS_BUILDLIB("CoinOR-OsiClp (Release)" MSBUILD_ARGS_SLN MSBUILD_ARGS_TARGET "Release" COINOR_DIR)
+    # Keep PlatformToolset override local to CoinMP builds
+    unset(CONTRIB_MSBUILD_PLATFORMTOOLSET)

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@libraries.cmake/coinor.cmake` around lines 46 - 53, The variable
CONTRIB_MSBUILD_PLATFORMTOOLSET is being set as global state within the
conditional block where CONTRIB_VS_VERSION is checked, and this can leak into
subsequent library builds since it persists as a global cmake variable that
OPENMS_BUILDLIB consumes. After the CoinMP targets are built and the
CONTRIB_MSBUILD_PLATFORMTOOLSET value is no longer needed, unset or clear this
variable to prevent it from affecting other library builds, or alternatively
pass the CONTRIB_MSBUILD_PLATFORMTOOLSET value explicitly in individual
OPENMS_BUILDLIB calls rather than relying on global state.

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Nitpick comments:
In `@libraries.cmake/coinor.cmake`:
- Around line 46-53: The variable CONTRIB_MSBUILD_PLATFORMTOOLSET is being set
as global state within the conditional block where CONTRIB_VS_VERSION is
checked, and this can leak into subsequent library builds since it persists as a
global cmake variable that OPENMS_BUILDLIB consumes. After the CoinMP targets
are built and the CONTRIB_MSBUILD_PLATFORMTOOLSET value is no longer needed,
unset or clear this variable to prevent it from affecting other library builds,
or alternatively pass the CONTRIB_MSBUILD_PLATFORMTOOLSET value explicitly in
individual OPENMS_BUILDLIB calls rather than relying on global state.

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 37efe1e6-d56c-4cae-991f-3abc5d9a8c1f

📥 Commits

Reviewing files that changed from the base of the PR and between f7358a0 and 1d341d7.

📒 Files selected for processing (4)

• .github/workflows/main.yml
• CMakeLists.txt
• libraries.cmake/coinor.cmake
• macros.cmake

[coderabbitai]

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@libraries.cmake/boost.cmake`:
- Around line 179-189: The verification loop iterating over Boost components is
missing the math component that is included in the _BOOST_LIBS list. Add math to
the foreach loop that iterates over the components (date_time, iostreams, regex,
system, thread) to ensure that if Boost.Math fails to install its CMake config,
the check will catch it at contrib-build time as intended.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 90a47f09-a84f-4eb8-8b63-1e1146e44fb9

📥 Commits

Reviewing files that changed from the base of the PR and between 1d341d7 and 7a67de5.

📒 Files selected for processing (2)

• CMakeLists.txt
• libraries.cmake/boost.cmake

[coderabbitai]

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Missing math component in post-install verification.

The verification loop checks only 5 of the 6 compiled components. math is listed in _BOOST_LIBS (line 69) but is missing from the verification foreach at line 182.

If Boost.Math fails to install its CMake config, this check won't catch it at contrib-build time, defeating the stated purpose of failing loudly here rather than later at OpenMS configure.

Proposed fix

-    foreach(_BOOST_COMP date_time iostreams regex system thread)
+    foreach(_BOOST_COMP math date_time iostreams regex system thread)

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@libraries.cmake/boost.cmake` around lines 179 - 189, The verification loop
iterating over Boost components is missing the math component that is included
in the _BOOST_LIBS list. Add math to the foreach loop that iterates over the
components (date_time, iostreams, regex, system, thread) to ensure that if
Boost.Math fails to install its CMake config, the check will catch it at
contrib-build time as intended.

[coderabbitai]

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)

libraries.cmake/boost.cmake (1)

248-261: ⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Status message includes --with-toolset but actual command does not.

The log messages at lines 248, 258, and 261 claim bootstrap.sh is invoked with --with-toolset=${_boost_bootstrap_toolchain}, but the actual execute_process command at line 249 omits this argument. This discrepancy will mislead developers debugging build failures.

Either add --with-toolset=${_boost_bootstrap_toolchain} to the actual command, or remove it from the messages to match reality.

Option A: Remove from messages to match current behavior

-    message(STATUS "Bootstrapping Boost libraries (./bootstrap.sh --prefix=${PROJECT_BINARY_DIR} --with-toolset=${_boost_bootstrap_toolchain} --with-libraries=date_time,filesystem,iostreams,math,regex,system,thread) ...")
+    message(STATUS "Bootstrapping Boost libraries (./bootstrap.sh --prefix=${PROJECT_BINARY_DIR} --with-libraries=date_time,filesystem,iostreams,math,regex,system,thread) ...")

(Apply similar fix to lines 258 and 261)

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@libraries.cmake/boost.cmake` around lines 248 - 261, The status messages at
lines 248, 258, and 261 reference the --with-toolset argument in the
bootstrap.sh command, but the actual execute_process command at line 249 does
not include this argument. Remove --with-toolset=${_boost_bootstrap_toolchain}
from all three message calls to match what is actually being executed, ensuring
the logged messages accurately reflect the real command being run.

♻️ Duplicate comments (1)

libraries.cmake/boost.cmake (1)

176-186: ⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Missing math and filesystem components in post-install verification.

The verification loop checks 5 components but the Linux/Mac path (line 249) builds 7 libraries including filesystem and math. If either fails to install its CMake config, this check won't detect it at contrib-build time.

Proposed fix

-    foreach(_BOOST_COMP date_time iostreams regex system thread)
+    foreach(_BOOST_COMP date_time filesystem iostreams math regex system thread)

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@libraries.cmake/boost.cmake` around lines 176 - 186, The verification loop in
the foreach statement only checks 5 Boost components (date_time, iostreams,
regex, system, thread) but the Linux/Mac build path actually builds 7 components
including filesystem and math. Add the missing filesystem and math components to
the list of components being verified in the foreach loop so that if either
fails to install its CMake config directory, the check will catch it and fail
loudly at contrib-build time rather than later during OpenMS configuration.

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Outside diff comments:
In `@libraries.cmake/boost.cmake`:
- Around line 248-261: The status messages at lines 248, 258, and 261 reference
the --with-toolset argument in the bootstrap.sh command, but the actual
execute_process command at line 249 does not include this argument. Remove
--with-toolset=${_boost_bootstrap_toolchain} from all three message calls to
match what is actually being executed, ensuring the logged messages accurately
reflect the real command being run.

---

Duplicate comments:
In `@libraries.cmake/boost.cmake`:
- Around line 176-186: The verification loop in the foreach statement only
checks 5 Boost components (date_time, iostreams, regex, system, thread) but the
Linux/Mac build path actually builds 7 components including filesystem and math.
Add the missing filesystem and math components to the list of components being
verified in the foreach loop so that if either fails to install its CMake config
directory, the check will catch it and fail loudly at contrib-build time rather
than later during OpenMS configuration.

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 17728647-9e7e-4636-bf6b-6672415ec4c2

📥 Commits

Reviewing files that changed from the base of the PR and between 7a67de5 and 7504732.

📒 Files selected for processing (5)

• .github/workflows/main.yml
• CMakeLists.txt
• libraries.cmake/boost.cmake
• libraries.cmake/coinor.cmake
• macros.cmake

🚧 Files skipped from review as they are similar to previous changes (4)

• macros.cmake
• libraries.cmake/coinor.cmake
• .github/workflows/main.yml
• CMakeLists.txt