Skip to content

Commit cd34ee4

Browse files
authored
Update setup.py
1 parent 8ed18e0 commit cd34ee4

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

setup.py

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -161,22 +161,9 @@ def main():
161161
# Files in sourcetree outside package dir that should be copied to package.
162162
# Raw paths relative to sourcetree root.
163163
files_outside_package_dir = {"cv2": ["LICENSE.txt", "LICENSE-3RD-PARTY.txt"]}
164-
165-
if os.name == "nt":
166-
vs_env = os.environ.get("VISUAL_STUDIO")
167-
if vs_env == "17":
168-
generator_name = "Visual Studio 17 2022"
169-
arch = "x64" if is64 else "Win32"
170-
ci_cmake_generator = ["-G", generator_name, "-A", arch]
171-
else:
172-
generator_name = "Visual Studio 14" + (" Win64" if is64 else "")
173-
ci_cmake_generator = ["-G", generator_name]
174-
else:
175-
ci_cmake_generator = ["-G", "Unix Makefiles"]
176164

177165
cmake_args = (
178-
(ci_cmake_generator if is_CI_build else [])
179-
+ [
166+
[
180167
# skbuild inserts PYTHON_* vars. That doesn't satisfy opencv build scripts in case of Py3
181168
"-DPYTHON3_EXECUTABLE=%s" % sys.executable,
182169
"-DPYTHON_DEFAULT_EXECUTABLE=%s" % sys.executable,

0 commit comments

Comments
 (0)