Skip to content

Commit cc314d5

Browse files
committed
Fix GeosLibrary wrapper on Windows and Python 2.7 with CMake 3.27.0+
1 parent 8681439 commit cc314d5

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ https://semver.org/spec/v2.0.0.html
1313
## [1.3.9]
1414

1515
### Fixed
16+
- Fix `GeosLibrary` wrapper to also work with CMake >= 3.27.0 and
17+
Python 2.7 on Windows by adding '/MANIFEST:NO' to override the new
18+
default '/MANIFEST:EMBED,ID=2' provided to linker.
1619
- Fix references to removed `numpy.float` alias (solves issue [#589],
1720
thanks to @quickbrett).
1821
- Fix bug with elliptical maps causing warped images (Blue Marble,

packages/basemap/utils/GeosLibrary.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,8 @@ def build(self, installdir=None, toolset=None, njobs=1):
250250
else:
251251
win64 = (8 * struct.calcsize("P") == 64)
252252
config_opts = ["-G", "NMake Makefiles"] + config_opts
253+
config_opts += ["-DCMAKE_EXE_LINKER_FLAGS='/MANIFEST:NO'"]
254+
config_opts += ["-DCMAKE_SHARED_LINKER_FLAGS='/MANIFEST:NO'"]
253255
build_opts.extend([
254256
"--",
255257
"WIN64={0}".format("YES" if win64 else "NO"),

0 commit comments

Comments
 (0)