diff --git a/ports/geogram/CONTROL b/ports/geogram/CONTROL index c74c9d216f..4d589b4224 100644 --- a/ports/geogram/CONTROL +++ b/ports/geogram/CONTROL @@ -1,6 +1,6 @@ Source: geogram Version: 1.7.5 -Port-Version: 1 +Port-Version: 2 Homepage: https://gforge.inria.fr/projects/geogram/ Description: Geogram is a programming library of geometric algorithms. Build-Depends: openblas, lapack diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake index b4b5594336..36f37694f8 100644 --- a/ports/geogram/portfile.cmake +++ b/ports/geogram/portfile.cmake @@ -1,4 +1,5 @@ set(GEOGRAM_VERSION 1.7.5) +vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_download_distfile(ARCHIVE URLS "https://gforge.inria.fr/frs/download.php/file/38314/geogram_${GEOGRAM_VERSION}.tar.gz" @@ -27,6 +28,11 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") if (VCPKG_TARGET_IS_WINDOWS) set(VORPALINE_PLATFORM Win-vs-generic) endif() + if (VCPKG_CRT_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) + message("geogram on Windows with CRT dynamic linkage only supports dynamic library linkage. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) + set(VORPALINE_PLATFORM Win-vs-dynamic-generic) + endif() if (VCPKG_TARGET_IS_LINUX) message("geogram on Linux only supports dynamic library linkage. Building dynamic.") set(VCPKG_LIBRARY_LINKAGE dynamic)