diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-12-06 00:57:58 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-12-06 00:57:58 -0800 |
| commit | 55605c73e04a08dd22b49b3e664441d579e0f2d5 (patch) | |
| tree | e1b010231ae439dfd1388dff04b90454a5f9ecf4 | |
| parent | 2f4a598970b4f845ec9cfb975aacde39d2377343 (diff) | |
| download | vcpkg-55605c73e04a08dd22b49b3e664441d579e0f2d5.tar.gz vcpkg-55605c73e04a08dd22b49b3e664441d579e0f2d5.zip | |
[gdal] Use CURRENT_INSTALLED_DIR instead of calculating it out. Use VCPKG_TARGET_ARCHITECTURE instead of parsing the triplet.
| -rw-r--r-- | ports/gdal/portfile.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index e5f148922..f198f4f0c 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -32,9 +32,9 @@ file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR) file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/gdal" NATIVE_DATA_DIR) file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/gdal/html" NATIVE_HTML_DIR) -file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/include" PROJ_INCLUDE_DIR) -file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/lib/proj.lib" PROJ_LIBRARY_REL) -file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/debug/lib/projd.lib" PROJ_LIBRARY_DBG) +file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PROJ_INCLUDE_DIR) +file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/proj.lib" PROJ_LIBRARY_REL) +file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/projd.lib" PROJ_LIBRARY_DBG) set(NMAKE_OPTIONS GDAL_HOME=${NATIVE_PACKAGES_DIR} @@ -44,7 +44,7 @@ set(NMAKE_OPTIONS MSVC_VER=1900 ) -if(TARGET_TRIPLET MATCHES "x64") +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") list(APPEND NMAKE_OPTIONS WIN64=YES) endif() |