Skip to content

Commit 613360b

Browse files
committed
Hardcode NASM path as ASM compiler for experiment.
1 parent 807f11f commit 613360b

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

.github/workflows/build_wheels_windows.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ jobs:
6262
- name: Build a package
6363
# CMake 3.25 regression fix. See https://stackoverflow.com/questions/74162633/problem-compiling-from-source-opencv-with-mvsc2019-in-64-bit-version
6464
run: |
65-
set PATH=C:\Users\runneradmin\nasm\;%PATH%
6665
python --version
6766
python -m pip install --upgrade pip
6867
python -m pip install --upgrade setuptools

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@ def main():
148148
files_outside_package_dir = {"cv2": ["LICENSE.txt", "LICENSE-3RD-PARTY.txt"]}
149149

150150
ci_cmake_generator = (
151-
["-G", "Visual Studio 17 2022"]
151+
["-G", "Visual Studio 17 2022",
152+
"-DCMAKE_ASM_COMPILER", "C:\\Users\\runneradmin\\nasm\\nasm.exe"]
152153
if os.name == "nt"
153154
else ["-G", "Unix Makefiles"]
154155
)

0 commit comments

Comments
 (0)