diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-05-09 20:53:13 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-05-09 11:53:13 -0700 |
| commit | cdc37cb6be6ac704f0bb09ec64c53ec2aaa7d1c3 (patch) | |
| tree | 9aa89954ba78864c4a21ecde67b810a5cdec6e7d | |
| parent | db47a79bd96e441deb9296f36f24d3c46dbb2d59 (diff) | |
| download | vcpkg-cdc37cb6be6ac704f0bb09ec64c53ec2aaa7d1c3.tar.gz vcpkg-cdc37cb6be6ac704f0bb09ec64c53ec2aaa7d1c3.zip | |
[geogram] enable building on non-win32 platforms (#6366)
| -rw-r--r-- | ports/geogram/CONTROL | 4 | ||||
| -rw-r--r-- | ports/geogram/portfile.cmake | 24 |
2 files changed, 24 insertions, 4 deletions
diff --git a/ports/geogram/CONTROL b/ports/geogram/CONTROL index 7b19ca9cf..87688018b 100644 --- a/ports/geogram/CONTROL +++ b/ports/geogram/CONTROL @@ -1,7 +1,7 @@ Source: geogram -Version: 1.6.9-2 +Version: 1.6.9-3 Description: Geogram is a programming library of geometric algorithms. -Build-Depends: openblas, clapack +Build-Depends: openblas (!osx), clapack Feature: graphics Description: Build viewers and geogram_gfx library. diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake index 46709f6c3..44f74f107 100644 --- a/ports/geogram/portfile.cmake +++ b/ports/geogram/portfile.cmake @@ -24,10 +24,30 @@ endif() if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(VORPALINE_BUILD_DYNAMIC FALSE) - set(VORPALINE_PLATFORM Win-vs-generic) + if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore") + set(VORPALINE_PLATFORM Win-vs-generic) + endif() + if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Linux") + message("geogram on Linux only supports dynamic library linkage. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) + set(VORPALINE_PLATFORM Linux64-gcc-dynamic ) + endif() + if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Darwin") + message("geogram on Darwin only supports dynamic library linkage. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) + set(VORPALINE_PLATFORM Darwin-clang-dynamic) + endif() else() set(VORPALINE_BUILD_DYNAMIC TRUE) - set(VORPALINE_PLATFORM Win-vs-dynamic-generic) + if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore") + set(VORPALINE_PLATFORM Win-vs-generic) + endif() + if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Linux") + set(VORPALINE_PLATFORM Linux64-gcc-dynamic ) + endif() + if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Darwin") + set(VORPALINE_PLATFORM Darwin-clang-dynamic) + endif() endif() vcpkg_configure_cmake( |