diff options
| author | Fabien Péan <fabien@pean.pro> | 2021-03-29 19:18:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 10:18:25 -0700 |
| commit | 105456798402aa5f494ffeb3b19dd0d870656d39 (patch) | |
| tree | 1f6b7f0afededd5c438ab6f0600cde01709ef6b9 | |
| parent | 5eae23f558cdae22bd894c450dbb43d26e916467 (diff) | |
| download | vcpkg-105456798402aa5f494ffeb3b19dd0d870656d39.tar.gz vcpkg-105456798402aa5f494ffeb3b19dd0d870656d39.zip | |
[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>
| -rw-r--r-- | ports/geogram/CONTROL | 2 | ||||
| -rw-r--r-- | ports/geogram/fix-windows-dynamic.patch | 11 | ||||
| -rw-r--r-- | ports/geogram/portfile.cmake | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/g-/geogram.json | 5 |
5 files changed, 19 insertions, 2 deletions
diff --git a/ports/geogram/CONTROL b/ports/geogram/CONTROL index 0a17639cc..19bbb144b 100644 --- a/ports/geogram/CONTROL +++ b/ports/geogram/CONTROL @@ -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 diff --git a/ports/geogram/fix-windows-dynamic.patch b/ports/geogram/fix-windows-dynamic.patch new file mode 100644 index 000000000..8df3b906f --- /dev/null +++ b/ports/geogram/fix-windows-dynamic.patch @@ -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
diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake index 36f37694f..8618b0412 100644 --- a/ports/geogram/portfile.cmake +++ b/ports/geogram/portfile.cmake @@ -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) diff --git a/versions/baseline.json b/versions/baseline.json index a3f1b4b83..92d134e9b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2158,7 +2158,7 @@ }, "geogram": { "baseline": "1.7.5", - "port-version": 2 + "port-version": 3 }, "geographiclib": { "baseline": "1.51", diff --git a/versions/g-/geogram.json b/versions/g-/geogram.json index fb07c2a51..20f81d74d 100644 --- a/versions/g-/geogram.json +++ b/versions/g-/geogram.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "178ba7fc99040231738fd282389038df5b032173", + "version-string": "1.7.5", + "port-version": 3 + }, + { "git-tree": "3661680b65627a46b6570d9017100f3e64d1f742", "version-string": "1.7.5", "port-version": 2 |