diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2019-05-13 17:57:55 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-05-13 08:57:55 -0700 |
| commit | 0413c73fd738350d1a91af1cd234b274541be1eb (patch) | |
| tree | 48ff467b15104e66e2206860e491273acf33d2a8 /ports/gdal | |
| parent | da5ee89be57ed79b79a6aa169c001e3fb6acd056 (diff) | |
| download | vcpkg-0413c73fd738350d1a91af1cd234b274541be1eb.tar.gz vcpkg-0413c73fd738350d1a91af1cd234b274541be1eb.zip | |
[CURL] Remove unnecessary renaming. (#6386)
* removed unnecessary renaming.
CMake updated its module file for FindCURL. so the renaming is not required anymore.
* bump control
* fix curl in static builds
* fix gdal regression
* fix typo
* fixed alignment
* fix libideviceactivation regression
* fix idevicerestore regression
Diffstat (limited to 'ports/gdal')
| -rw-r--r-- | ports/gdal/CONTROL | 2 | ||||
| -rw-r--r-- | ports/gdal/portfile.cmake | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL index 155851ad8..c0b8820b2 100644 --- a/ports/gdal/CONTROL +++ b/ports/gdal/CONTROL @@ -1,5 +1,5 @@ Source: gdal -Version: 2.4.1-4 +Version: 2.4.1-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, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index ea3ce9dbf..b880c9184 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -94,8 +94,16 @@ if (WIN32) # Build in WINDOWS # 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.lib" CURL_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl.lib" CURL_LIBRARY_DBG) + if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/libcurl.lib") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libcurl.lib" CURL_LIBRARY_REL) + elseif(EXISTS "${CURRENT_INSTALLED_DIR}/lib/libcurl_imp.lib") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libcurl_imp.lib" CURL_LIBRARY_REL) + endif() + if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d.lib") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d.lib" CURL_LIBRARY_DBG) + elseif(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d_imp.lib") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d_imp.lib" CURL_LIBRARY_DBG) + endif() # Setup sqlite3 libraries + include path file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" SQLITE_INCLUDE_DIR) @@ -270,7 +278,7 @@ if (WIN32) # Build in WINDOWS if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/gdal/html) endif() - + vcpkg_execute_required_process( COMMAND ${NMAKE} -f makefile.vc "${NMAKE_OPTIONS_REL}" |