Refactor CMake Ice package handling into modules#745
Merged
externl merged 5 commits intozeroc-ice:mainfrom Mar 13, 2026
Merged
Conversation
Split Windows Ice NuGet and PDB handling into separate modules: - Extract NuGet package download logic to ice-nuget.cmake - Extract PDB download and copy logic to ice-pdbs.cmake - Remove download-ice-pdbs.cmake (functionality merged into ice-pdbs.cmake) - Use cmake_path for better path handling in copy-ice-pdbs.cmake - Improve error handling with temporary directory cleanup on failure
There was a problem hiding this comment.
Pull request overview
This PR refactors the Windows-specific Ice CMake support by extracting NuGet package setup and PDB download/copy logic out of common.cmake into dedicated modules, and modernizes some path handling.
Changes:
- Add
ice-nuget.cmaketo download/configure the Ice NuGet package on Windows and setIce_ROOT/Ice_NUGET_VERSION. - Add
ice-pdbs.cmaketo download/extract Ice PDBs at configure time and provideice_copy_pdbs()for build-time copying. - Remove the old
download-ice-pdbs.cmakeand updatecopy-ice-pdbs.cmaketo usecmake_path.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| cpp/cmake/ice-pdbs.cmake | New module to download/extract PDBs and define ice_copy_pdbs() |
| cpp/cmake/ice-nuget.cmake | New module to acquire nuget.exe, install Ice NuGet, and set Ice_ROOT |
| cpp/cmake/download-ice-pdbs.cmake | Removed; functionality moved into ice-pdbs.cmake |
| cpp/cmake/copy-ice-pdbs.cmake | Uses cmake_path(GET ... STEM ...) for DLL name extraction |
| cpp/cmake/common.cmake | Includes the new modules and removes inlined NuGet/PDB logic |
You can also share your feedback on Copilot code review. Take the survey.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.
You can also share your feedback on Copilot code review. Take the survey.
bernardnormier
approved these changes
Mar 12, 2026
pepone
reviewed
Mar 13, 2026
|
|
||
|
|
||
| option(ICE_COPY_PDB "Download and copy Ice PDB files alongside DLLs" OFF) | ||
| if(ICE_COPY_PDB) |
Member
There was a problem hiding this comment.
Do you know how CMake handle parallel builds here?
pepone
approved these changes
Mar 13, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Split Windows Ice NuGet and PDB out of
common.cmake.