diff options
| author | Manuel Massing <m.massing@warped-space.de> | 2016-11-30 10:26:18 +0100 |
|---|---|---|
| committer | Manuel Massing <m.massing@warped-space.de> | 2016-11-30 10:38:56 +0100 |
| commit | 05f9b3a164085d3069be3e95d6bb469fc9b0438f (patch) | |
| tree | fa476169d12f713ac298eac5706013ae1323efa4 | |
| parent | e3001c78b91531b5170181935fd7b0293fdb82a8 (diff) | |
| download | vcpkg-05f9b3a164085d3069be3e95d6bb469fc9b0438f.tar.gz vcpkg-05f9b3a164085d3069be3e95d6bb469fc9b0438f.zip | |
[gdal] Rename dynamic gdal libraries to match static library naming, add "d" suffix for debug libraries
| -rw-r--r-- | ports/gdal/portfile.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index ee003d622..e5f148922 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -66,6 +66,7 @@ set(NMAKE_OPTIONS_REL CXX_CRT_FLAGS=${LINKAGE_FLAGS} PROJ_LIBRARY=${PROJ_LIBRARY_REL} ) + set(NMAKE_OPTIONS_DBG "${NMAKE_OPTIONS}" CXX_CRT_FLAGS="${LINKAGE_FLAGS}d" @@ -113,11 +114,14 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/gdal_i.lib) file(COPY ${SOURCE_PATH_DEBUG}/gdal.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) file(COPY ${SOURCE_PATH_RELEASE}/gdal.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gdal.lib ${CURRENT_PACKAGES_DIR}/debug/lib/gdald.lib) else() - file(COPY ${SOURCE_PATH_DEBUG}/gdal111.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(COPY ${SOURCE_PATH_DEBUG}/gdal_i.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) file(GLOB EXE_FILES ${CURRENT_PACKAGES_DIR}/bin/*.exe) file(REMOVE ${EXE_FILES} ${CURRENT_PACKAGES_DIR}/lib/gdal.lib) + file(COPY ${SOURCE_PATH_DEBUG}/gdal111.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(COPY ${SOURCE_PATH_DEBUG}/gdal_i.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gdal_i.lib ${CURRENT_PACKAGES_DIR}/lib/gdal.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gdal_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/gdald.lib) endif() # Copy over PDBs |