Improvements to CMake builds on Windows #326
Merged
Conversation
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
externl
commented
Feb 28, 2025
externl
commented
Feb 28, 2025
| @@ -1,4 +1,4 @@ | |||
| cmake_minimum_required(VERSION 3.16) | |||
| cmake_minimum_required(VERSION 3.21) | |||
There was a problem hiding this comment.
TARGET_RUNTIME_DLLS is a 3.21 feature.
pepone
reviewed
Mar 1, 2025
cpp/cmake/IceConfig.cmake
Outdated
| set(Ice_SOURCE_BUILD ON) | ||
| endif() | ||
|
|
||
| if(Ice_SOURCE_BUILD) |
There was a problem hiding this comment.
For other languages we are no longer supporting to use the source build.
pepone
approved these changes
Mar 1, 2025
|
|
||
| if (WIN32) | ||
| set(Ice_NUGET_NAME "zeroc.ice.v143") | ||
| set(Ice_NUGET_DIR "${CMAKE_CURRENT_LIST_DIR}/packages/${Ice_NUGET_NAME}") |
There was a problem hiding this comment.
I guessing that I can use a custom NuGet build by just installing it to this location, which would skip the install below.
cpp/cmake/IceConfig.cmake
Outdated
| list(APPEND ice_lib_path_suffixes_release "cpp/lib") | ||
| list(APPEND ice_lib_path_suffixes "cpp/lib") | ||
|
|
||
| if (Ice_ARCHITECTURE) |
There was a problem hiding this comment.
What is Ice_ARCHITECTURE and when is it not-set?
There was a problem hiding this comment.
It's computed from a few values (see above).
- If
CMAKE_LIBRARY_ARCHITECTUREis set we use it. For example this is set on Ubuntu to something like "x86_64-linux-gnu" - Otherwise if not set and we're on Windows we'll set it to either x64 or Win32
It's fine if it's not set. It's a matter of checking lib vs lib/<arch>. For instance it's not set on macOS.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR adds several improvements for the CMake builds on Windows.
cpp/cmake/packages