Skip to content

Commit f4deb4d

Browse files
committed
compile libtiff with cmake
(cherry picked from commit 3f17d61)
1 parent 759c518 commit f4deb4d

File tree

3 files changed

+4
-226
lines changed

3 files changed

+4
-226
lines changed

setup.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -727,9 +727,7 @@ def build_extensions(self):
727727
if feature.tiff:
728728
libs.append(feature.tiff)
729729
defs.append(("HAVE_LIBTIFF", None))
730-
# FIXME the following define should be detected automatically
731-
# based on system libtiff, see #4237
732-
if PLATFORM_MINGW:
730+
if sys.platform == "win32":
733731
defs.append(("USE_WIN32_FILEIO", None))
734732
if feature.xcb:
735733
libs.append(feature.xcb)

winbuild/build_prepare.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ def cmd_msbuild(
145145
"filename": "tiff-4.2.0.tar.gz",
146146
"dir": "tiff-4.2.0",
147147
"build": [
148-
cmd_copy(r"{winbuild_dir}\tiff.opt", "nmake.opt"),
149-
cmd_nmake("makefile.vc", "clean"),
150-
cmd_nmake("makefile.vc", "lib"),
148+
cmd_cmake("-DBUILD_SHARED_LIBS:BOOL=OFF"),
149+
cmd_nmake(target="clean"),
150+
cmd_nmake(target="tiff"),
151151
],
152152
"headers": [r"libtiff\tiff*.h"],
153153
"libs": [r"libtiff\*.lib"],

winbuild/tiff.opt

-220
This file was deleted.

0 commit comments

Comments
 (0)