diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-08-16 10:40:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-16 10:40:49 -0700 |
| commit | 9884ebac6ae4dbd31d244e1f77dc8ed8e26f17ab (patch) | |
| tree | e946037aa317d0ca241857a76089885b58124c5a | |
| parent | bd37f610213fe11d76f6be1f80e4785e89880fe5 (diff) | |
| parent | f2482d3af9df693b59495c25910852daaf920b3d (diff) | |
| download | vcpkg-9884ebac6ae4dbd31d244e1f77dc8ed8e26f17ab.tar.gz vcpkg-9884ebac6ae4dbd31d244e1f77dc8ed8e26f17ab.zip | |
Merge pull request #1655 from albertziegenhagel/gdal-fix-link-curl
[gdal] Fix linking curl libraries
| -rw-r--r-- | ports/gdal/CONTROL | 2 | ||||
| -rw-r--r-- | ports/gdal/portfile.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL index 2182a3d35..868a5e929 100644 --- a/ports/gdal/CONTROL +++ b/ports/gdal/CONTROL @@ -1,4 +1,4 @@ Source: gdal -Version: 1.11.3-4 +Version: 1.11.3-5 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data. Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, libmysql, openjpeg, libwebp, libxml2, liblzma diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 96fa8fa6a..214ec2024 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -55,8 +55,8 @@ file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/expat.lib" EXPAT_LIBRARY # Setup curl libraries + include path file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" CURL_INCLUDE_DIR) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libcurl_imp.lib" CURL_LIBRARY_REL) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl_imp.lib" CURL_LIBRARY_DBG) +file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libcurl.lib" CURL_LIBRARY_REL) +file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl.lib" CURL_LIBRARY_DBG) # Setup sqlite3 libraries + include path file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" SQLITE_INCLUDE_DIR) |