Move to windows-2025 Visual Studio -> 17 and update submodules #1105
+33
−28
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
Merge pull request opencv#1100 from avdivan:4.x
asmorkalov
reviewed
Jun 18, 2025
| with: | ||
| submodules: false | ||
| fetch-depth: 0 | ||
| fetch-depth: 0 |
| python --version | ||
| python -m pip install --upgrade pip | ||
| python -m pip install --upgrade setuptools | ||
| python -m pip install cmake==3.24.2 | ||
| python -m pip install toml && python -c "import toml; c = toml.load('pyproject.toml'); print('\n'.join(c['build-system']['requires']))" >> requirements.txt | python -m pip install -r requirements.txt | ||
| set "CI_BUILD=1" && python setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=%cd%\wheelhouse -v | ||
| shell: cmd | ||
|
|
Comment on lines
+163
to
+173
| if os.name == "nt": | ||
| vs_env = os.environ.get("VISUAL_STUDIO") | ||
| if vs_env == "17": | ||
| generator_name = "Visual Studio 17 2022" | ||
| arch = "x64" if is64 else "Win32" | ||
| ci_cmake_generator = ["-G", generator_name, "-A", arch] | ||
| else: | ||
| generator_name = "Visual Studio 14" + (" Win64" if is64 else "") | ||
| ci_cmake_generator = ["-G", generator_name] | ||
| else: | ||
| ci_cmake_generator = ["-G", "Unix Makefiles"] |
There was a problem hiding this comment.
It makes sense to override full generator name with environment variable and substitute it as is.
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.
No description provided.