Skip to content

Commit 4721363

Browse files
authored
Update setup.py
1 parent a397db1 commit 4721363

File tree

1 file changed

+7
-19
lines changed

1 file changed

+7
-19
lines changed

setup.py

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -160,27 +160,15 @@ def main():
160160
# Raw paths relative to sourcetree root.
161161
files_outside_package_dir = {"cv2": ["LICENSE.txt", "LICENSE-3RD-PARTY.txt"]}
162162

163-
def get_windows_version():
164-
try:
165-
release_str = platform.release()
166-
if release_str == "2025":
167-
return 2025
163+
if os.name == "nt":
164+
if windows_version == 2025:
165+
generator_name = "Visual Studio 17"
168166
else:
169-
return int(release_str)
170-
except Exception:
171-
return None
172-
173-
windows_version = get_windows_version()
174-
175-
if os.name == "nt":
176-
if windows_version == 2025:
177-
generator_name = "Visual Studio 17"
167+
enerator_name = "Visual Studio 14"
168+
ci_cmake_generator = ["-G", generator_name + (" Win64" if is64 else "")]
178169
else:
179-
generator_name = "Visual Studio 14"
180-
ci_cmake_generator = ["-G", generator_name + (" Win64" if is64 else "")]
181-
else:
182-
ci_cmake_generator = ["-G", "Unix Makefiles"]
183-
170+
ci_cmake_generator = ["-G", "Unix Makefiles"]
171+
184172
cmake_args = (
185173
(ci_cmake_generator if is_CI_build else [])
186174
+ [

0 commit comments

Comments
 (0)