diff options
| author | Mateusz Loskot <mateusz@loskot.net> | 2018-05-01 10:14:18 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-05-01 01:14:18 -0700 |
| commit | 793019b9cd362aefac06cd7f94d6e6db77d31b69 (patch) | |
| tree | be2dde21ac73b2182e40282f799de33836e232d5 /ports/gdal | |
| parent | c4caf29213f54b1786102c1b4dc085b6d7142998 (diff) | |
| download | vcpkg-793019b9cd362aefac06cd7f94d6e6db77d31b69.tar.gz vcpkg-793019b9cd362aefac06cd7f94d6e6db77d31b69.zip | |
[GEOS] Generate debug library names with `d` suffix (#3371)
* [GEOS] Generate debug library names with `d` suffix
Currently geos.lib name is used for both, debug and optimised
GEOS libraries. This leads to situation when:
```
find_library(GEOS_LIBRARY_DEBUG NAMES geos)
find_library(GEOS_LIBRARY_RELEASE NAMES geos)
```
finds the same library for both
```
GEOS_LIBRARY_DEBUG=D:/vcpkg/installed/x64-windows/debug/lib/geos.lib
GEOS_LIBRARY_RELEASE=D:/vcpkg/installed/x64-windows/debug/lib/geos.lib
```
This is minimal patch that works around the problem.
Next, complete fix should be submitted to GEOS upstream,
preferably using exported targets.
* [libspatialite] Add missing geos suffixes in static builds
Diffstat (limited to 'ports/gdal')
| -rw-r--r-- | ports/gdal/portfile.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 10e2ceab8..ba77b624a 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -55,7 +55,7 @@ file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.lib" PNG_LIBRA # Setup geos libraries + include path file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" GEOS_INCLUDE_DIR) file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib" GEOS_LIBRARY_REL) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geos_c.lib" GEOS_LIBRARY_DBG) +file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib" GEOS_LIBRARY_DBG) # Setup expat libraries + include path file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" EXPAT_INCLUDE_DIR) |