8000 Do not force CMAKE_GENERATOR_PLATFORM on Windows x86_64 by asmorkalov · Pull Request #863 · opencv/opencv-python · GitHub
[go: up one dir, main page]
Skip to content

Do not force CMAKE_GENERATOR_PLATFORM on Windows x86_64 #863

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 4.x
Choose a base branch
from
Open

Do not force CMAKE_GENERATOR_PLATFORM on Windows x86_64 #863

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Do not force CMAKE_GENERATOR_PLATFORM on Windows x86_64.
  • Loading branch information
@asmorkalov
asmorkalov committed Jun 29, 2023
commit adebc7c11a01c610dd620cd75bfee52bd3408c26
2 changes: 0 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,6 @@ def main():
"-DOPENCV_WORKAROUND_CMAKE_20989=ON",
"-DCMAKE_SYSTEM_PROCESSOR=ARM64"]
if platform.machine() == "ARM64" and sys.platform == "win32"
# If it is not defined 'linker flags: /machine:X86' on Windows x64
else ["-DCMAKE_GENERATOR_PLATFORM=x64"] if is64 and sys.platform == "win32"
else []
)
+ (
Expand Down
0