aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Arzhannikov <iarzhannikov@artec-group.com>2020-10-06 18:24:52 +0200
committerGitHub <noreply@github.com>2020-10-06 09:24:52 -0700
commit7f0ea8004d3422969957191bd27425941e9bdc56 (patch)
tree45ebcdb11be6c3a81e0340f5b8567a2e1e76fbe0
parent748a2564ef288f85d371d469a8cba8ae7b14d989 (diff)
downloadvcpkg-7f0ea8004d3422969957191bd27425941e9bdc56.tar.gz
vcpkg-7f0ea8004d3422969957191bd27425941e9bdc56.zip
[geogram] build geogram dynamic if crt linkage dynamic (#13719)
Co-authored-by: wangli28 <wangli28@beyondsoft.com>
-rw-r--r--ports/geogram/CONTROL2
-rw-r--r--ports/geogram/portfile.cmake6
2 files changed, 7 insertions, 1 deletions
diff --git a/ports/geogram/CONTROL b/ports/geogram/CONTROL
index c74c9d216..4d589b422 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 b4b559433..36f37694f 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)