diff options
| author | JuttaAnders <11270784+JuttaAnders@users.noreply.github.com> | 2019-03-31 18:32:29 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-03-31 09:32:29 -0700 |
| commit | 6f0923ae93d28287d21219c57a6c8cd3e249bdd4 (patch) | |
| tree | 7724f7ea634751a7f4376e190ee074f49ab9ecac | |
| parent | 8757c643f5cf1817bbdd25768e7d198e9bfd1666 (diff) | |
| download | vcpkg-6f0923ae93d28287d21219c57a6c8cd3e249bdd4.tar.gz vcpkg-6f0923ae93d28287d21219c57a6c8cd3e249bdd4.zip | |
Fix for shared build broken due to #5839 (#5882)
| -rw-r--r-- | ports/gdal/portfile.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index daa9c0a04..644160a59 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -63,8 +63,13 @@ 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/libgeos.lib" GEOS_LIBRARY_REL) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libgeosd.lib" GEOS_LIBRARY_DBG) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libgeos.lib" GEOS_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libgeosd.lib" GEOS_LIBRARY_DBG) +else() + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib" GEOS_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib" GEOS_LIBRARY_DBG) +endif() # Setup expat libraries + include path file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" EXPAT_INCLUDE_DIR) |