- Notifications
You must be signed in to change notification settings - Fork919
Move to windows-2025 Visual Studio -> 17 and update submodules#1105
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Conversation
Merge pull requestopencv#1100 from avdivan:4.x
| with: | ||
| submodules: false | ||
| fetch-depth: 0 | ||
| fetch-depth: 0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
trailing whitespace.
| 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 | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
not needed.
setup.py Outdated
| 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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
It makes sense to override full generator name with environment variable and substitute it as is.
No description provided.