[geogram] Fix windows dynamic build usage (#14962)

* [geogram] Fix windows dynamic build usage

* [geogram] Add version db entry

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
This commit is contained in:
Fabien Péan 2021-03-29 19:18:25 +02:00 committed by GitHub
parent 5eae23f558
commit 1054567984
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 2 deletions

View File

@ -1,6 +1,6 @@
Source: geogram
Version: 1.7.5
Port-Version: 2
Port-Version: 3
Homepage: https://gforge.inria.fr/projects/geogram/
Description: Geogram is a programming library of geometric algorithms.
Build-Depends: blas, lapack

View File

@ -0,0 +1,11 @@
diff --git a/src/lib/geogram/CMakeLists.txt b/src/lib/geogram/CMakeLists.txt
index 49cb2ba..82c2f39 100755
--- a/src/lib/geogram/CMakeLists.txt
+++ b/src/lib/geogram/CMakeLists.txt
@@ -62,3 +62,6 @@ if(WIN32)
endif()
+if(WIN32 AND VORPALINE_BUILD_DYNAMIC)
+ target_compile_definitions(geogram PUBLIC GEO_DYNAMIC_LIBS)
+endif()
# Install the library

View File

@ -13,6 +13,7 @@ vcpkg_extract_source_archive_ex(
REF ${GEOGRAM_VERSION}
PATCHES
fix-cmake-config-and-install.patch
fix-windows-dynamic.patch
)
file(COPY ${CURRENT_PORT_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}/cmake)

View File

@ -2158,7 +2158,7 @@
},
"geogram": {
"baseline": "1.7.5",
"port-version": 2
"port-version": 3
},
"geographiclib": {
"baseline": "1.51",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "178ba7fc99040231738fd282389038df5b032173",
"version-string": "1.7.5",
"port-version": 3
},
{
"git-tree": "3661680b65627a46b6570d9017100f3e64d1f742",
"version-string": "1.7.5",